Changeset 480 for trunk/lib/Prefs.inc.php

Timestamp:

May 4, 2014 12:29:05 AM (10 years ago)

Author:

anonymous

Message:

Removed some legacy files. Improved use of array_key_exists.

File:

• trunk/lib/Prefs.inc.php (modified) (2 diffs)

trunk/lib/Prefs.inc.php

@@ -275 +275 @@
             // - or the new value is different than the default
             // - or there is a previously existing saved key.
-            if (!array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults'])
+            if (!(isset($_SESSION['_prefs'][$this->_ns]['defaults']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['defaults']))
             || $_SESSION['_prefs'][$this->_ns]['defaults'][$key] != $val
-            || array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved'])) {
+            || (isset($_SESSION['_prefs'][$this->_ns]['saved']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']))) {
                 $_SESSION['_prefs'][$this->_ns]['saved'][$key] = $val;
                 $app->logMsg(sprintf('Setting session preference %s => %s', $key, getDump($val, true)), LOG_DEBUG, __FILE__, __LINE__);
@@ -348 +348 @@
         case 'session':
         case 'database':
-            return array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']);
+            return (isset($_SESSION['_prefs'][$this->_ns]['saved']) && array_key_exists($key, $_SESSION['_prefs'][$this->_ns]['saved']));
 
         case 'cookie':
             $name = $this->_getCookieName($key);
-            return array_key_exists($name, $_COOKIE);
+            return (isset($_COOKIE) && array_key_exists($name, $_COOKIE));
         }