same fix as in 1.5.1. Color codes without # does not work in standard compliance...

[squirrelmail.git] / include / load_prefs.php

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 739392101513eee99ab504705ef24e96af51083a..6fff5fb285007286c8508a7c24bf3ae239af2ba9 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -27,10 +27,10 @@ $custom_css = getPref($data_dir, $username, 'custom_css', 'none' );
 $theme = ( !isset($theme) ? array() : $theme );
 $color = ( !isset($color) ? array() : $color );
 $aTemplateSet = ( !isset($aTemplateSet) ? array() : $aTemplateSet );
+$templateset_default = ( !isset($templateset_default) ? 0 : $templateset_default );
 
 $chosen_theme = getPref($data_dir, $username, 'chosen_theme');
-$sTplDir = getPref($data_dir, $username, 'sTplDir');
-
+$sTplDir = getPref($data_dir, $username, 'sTplDir', SM_PATH . 'templates/default/');
 $found_templateset = false;
 
 /* need to adjust $chosen_template path with SM_PATH */
@@ -44,7 +44,7 @@ for ($i = 0; $i < count($aTemplateSet); ++$i){
 }
 $sTplDir = ($found_templateset ? $sTplDir : '');
 if (!$found_templateset) {
-    if (isset($aTemplateSet) && isset($aTemlateSet[$templateset_default]) && file_exists($aTemplateSet[$templateset_default]['PATH'])) {
+    if (isset($aTemplateSet) && isset($aTemplateSet[$templateset_default]) && file_exists($aTemplateSet[$templateset_default]['PATH'])) {
        $sTplDir = $aTemplateSet[$templateset_default]['PATH'];
     } else {
        $sTplDir = SM_PATH.'templates/default/';
@@ -393,4 +393,4 @@ $chosen_fontsize = getPref($data_dir, $username, 'chosen_fontsize', $default_fon
 
 do_hook('loading_prefs');
 
-?>
\ No newline at end of file
+?>