Changeset 480 for trunk/lib/Cache.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/Cache.inc.php (modified) (3 diffs)

trunk/lib/Cache.inc.php

@@ -211 +211 @@
         }
 
-        if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
+        if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
             $app->logMsg(sprintf('Retreiving %s from cache.', $key), LOG_DEBUG, __FILE__, __LINE__);
             // Move the accessed cached datum to the top of the stack. Maybe somebody knows a better way to do this?
@@ -240 +240 @@
         }
 
-        return array_key_exists($key, $_SESSION['_cache'][$this->_ns]);
+        return (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns]));
     }
 
@@ -251 +251 @@
     public function delete($key)
     {
-        if (array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
+        if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
             unset($_SESSION['_cache'][$this->_ns][$key]);
             return true;