fsf changes, meant to be rebased on upstream

[squirrelmail.git] / functions / options.php

diff --git a/functions/options.php b/functions/options.php
index dc4209530b547cffc34c7dcfb8f7f400de2c7ba2..947deb24721773d7ef869011dde6741292f3317d 100644 (file)
--- a/functions/options.php
+++ b/functions/options.php
@@ -5,7 +5,7 @@
  *
  * Functions needed to display the options pages.
  *
- * @copyright 1999-2017 The SquirrelMail Project Team
+ * @copyright 1999-2021 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
  * @version $Id$
  * @package squirrelmail
@@ -235,6 +235,8 @@ class SquirrelOption {
         //Check for a current value.  
         if (isset($GLOBALS[$name])) {
             $this->value = $GLOBALS[$name];
+        // TODO: This code should be something more like the following, but who knows what would break if it was changed at this point
+        // } else if (initial_value !== '') {
         } else if (!empty($initial_value)) {
             $this->value = $initial_value;
         } else {