when falling back to the default theme, set $chosen_theme to the path

of default to make functions that depend on $chosen_theme work
correctly (most notably the select list under display preferences which
would have Alien Glow selected when user has no theme set). Thanks Tim Craig
for the bugreport.

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

diff --git a/ChangeLog b/ChangeLog
index d75bb24aa409878b2b5383f2c983c19f236878a8..77e140b4980922342655e7a8062867bffdd9e0ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -60,6 +60,8 @@ Version 1.5.0 -- CVS
   - Fix when forwarding messages as attachment from message list, the displayed subject
     was wrong (appearing to the user that the wrong messages were attached).
     Closes #772371.
+  - Fix that when user has no theme preference set, Alien Glow would be selected under
+    display preferences in stead of Default.
 
 **************************************
 *** SquirrelMail Stable Series 1.4 ***

diff --git a/include/load_prefs.php b/include/load_prefs.php
index 1fd5fd20896959efc85220cf579a77415900f5e6..2407d830509aab6fe4796bca9637c7d58a51a22f 100644 (file)
--- a/include/load_prefs.php
+++ b/include/load_prefs.php
@@ -46,6 +46,7 @@ if (isset($chosen_theme) && $found_theme && (file_exists($chosen_theme))) {
 } else {
     if (isset($theme) && isset($theme[$theme_default]) && file_exists($theme[$theme_default]['PATH'])) {
         @include_once($theme[$theme_default]['PATH']);
+        $chosen_theme = $theme[$theme_default]['PATH'];
     } else {
         /**
          * This theme as a failsafe if no themes were found. It makes