[SM-CVS] CVS: squirrelmail/src signout.php,1.89,1.90

[Thijs K. <ki...@us...>]

Update of /cvsroot/squirrelmail/squirrelmail/src
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv19161

Modified Files:
	signout.php 
Log Message:
add code to reinitialize the templating for the case that one has reloaded
signout.php. that used to spew all kinds of errors, this handles it more
gracefully. closes: #1519716


Index: signout.php
===================================================================
RCS file: /cvsroot/squirrelmail/squirrelmail/src/signout.php,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -w -r1.89 -r1.90
--- signout.php	5 Apr 2006 00:22:11 -0000	1.89
+++ signout.php	11 Jul 2006 22:23:33 -0000	1.90
@@ -85,5 +85,19 @@
     '', $color[0] ) ,
 'center', $color[4], 'width="50%" cellpadding="2" cellspacing="0" border="0"' );
 
+/* After a reload of signout.php, $oTemplate might not exist anymore.
+ * Recover, so that we don't get all kinds of errors in that situation. */
+if ( !isset($oTemplate) || !is_object($oTemplate) ) {
+    require_once(SM_PATH . 'class/template/template.class.php');
+    $aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
+    $templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
+
+    $sTplDir = ( !isset($aTemplateSet[$templateset_default]['PATH']) ?
+             SM_PATH . 'templates/default/' :
+             $aTemplateSet[$templateset_default]['PATH'] );
+    $oTemplate = new Template($sTplDir);
+}
+
 $oTemplate->display('footer.tpl');
+
 ?>