Fix incorrect template assignment.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@11609 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/include/init.php b/include/init.php
index 9610e4933c4510f69f537b94cebf2951ac07fba0..0e00ac2477fe8d9d2d00f994692cb7e92b91f9a6 100644 (file)
--- a/include/init.php
+++ b/include/init.php
@@ -407,7 +407,6 @@ switch ($sInitLocation) {
          */
         require(SM_PATH . 'include/load_prefs.php');
 
-
 // i do not understand the frames language cookie story
         /**
          * We'll need this to later have a noframes version
@@ -491,17 +490,23 @@ switch ($sInitLocation) {
  * Initialize the template object
  */
 require(SM_PATH . 'class/template/template.class.php');
+
 /*
  * $sTplDir is not initialized when a user is not logged in, so we will use
  * the config file defaults here.  If the neccesary variables are net set,
  * force a default value.
+ * 
+ * If the user is logged in, $sTplDir will be set in load_prefs.php, so we
+ * shouldn't change it here.
  */
-$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'] );
+if (!isset($sTplDir)) {
+    $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);
 
 /**