- Issue loading options page always loaded the prefs

    initial_value on display, instead of the users' value.

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

diff --git a/ChangeLog b/ChangeLog
index 46b6240d9de70b28c8b9f829c5d3919d1b7ba3dd..4e6db3459a9c6aa60635eca3571a4d96419697f0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,7 +22,8 @@ Version 1.5.2 - CVS
   - Added new color themes by Jeremy Landes, Tammi Maggard and Lucas Austin-Howe 
     (#1378332), (#1377567), (#1377529), (#1377528), (#1377527), (#1377526), 
     (#1377525), (#1393188).
-  
+  - Issue loading options page always loaded the prefs 
+    initial_value on display, instead of the users' value.
        
 Version 1.5.1 (branched on 2006-02-12)
 --------------------------------------

diff --git a/functions/options.php b/functions/options.php
index 8175f0bf5368bfed9d53d9a1fb759a1cae41ec0f..189f1f714cec8fd6630ad260e47fbae44a06d9a5 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -176,10 +176,10 @@ class SquirrelOption {
         $this->post_script = '';
 
         /* Check for a current value. */
-        if (!empty($initial_value)) {
-            $this->value = $initial_value;
-        } else if (isset($GLOBALS[$name])) {
+        if (isset($GLOBALS[$name])) {
             $this->value = $GLOBALS[$name];
+        } else if (!empty($initial_value)) {
+            $this->value = $initial_value;
         } else {
             $this->value = '';
         }
@@ -734,4 +734,4 @@ function OptionSubmit( $name ) {
 }
 
 // vim: et ts=4
-?>
\ No newline at end of file
+?>