X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=include%2Fload_prefs.php;h=8df7e9d479cc9341f5789538674b0b3973bb5d6e;hb=3fa8537239e20cc99db2982558ba926c70e0e9d6;hp=8a68404d7709727a15023d9a9c4525eaea8935de;hpb=1e7218745fd9a5d248bc896661b0d44fc23bcde5;p=squirrelmail.git

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 8a68404d..8df7e9d4 100644
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -35,6 +35,11 @@ $custom_css = getPref($data_dir, $username, 'custom_css', 'none' );
 $sDefaultTemplateID = Template::get_default_template_set();
 $sTemplateID = getPref($data_dir, $username, 'sTemplateID', $sDefaultTemplateID);
 
+// need to build this object now because it is used below to validate
+// user css theme choice
+//
+$oTemplate = Template::construct_template($sTemplateID);
+
 // check user prefs template selection against templates actually available
 //
 $found_templateset = false;
@@ -66,14 +71,18 @@ while (!$found_theme && $k < count($user_themes)) {
         $found_theme = true;
     $k++;
 }
+$template_themes = $oTemplate->get_alternative_stylesheets();
+while (!$found_theme && (list($path, $name) = each($template_themes))) {
+    if ('t_'.$path == $chosen_theme_path)
+        $found_theme = true;
+}
+    
 if (!$found_theme || $chosen_theme == 'none') {
     $chosen_theme_path = NULL;
 }
 
-/* PL: Steve, is this commented out because it is part of the old system being removed?
-       Let's just remove it then... no?
-   
-   SB: Holding on to incase I need to reference later.  Will remove eventually. :)
+/* ----- SB: Holding on to the following code incase I need to reference later.  
+       Will remove eventually. :)
    
 $theme = ( !isset($theme) ? array() : $theme );
 $color = ( !isset($color) ? array() : $color );
@@ -102,7 +111,7 @@ if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
     }
 }
 
-*/
+------ */
 
 // user's icon theme, if using icons
 $icon_theme = getPref($data_dir, $username, 'icon_theme');