Changeset 523 for trunk/lib/Cache.inc.php

Timestamp:

May 24, 2015 3:01:42 PM (9 years ago)

Author:

anonymous

Message:

First set of changes towards 2.2.0. Improved functinoality with integration in wordpress; bugs fixed.

File:

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

trunk/lib/Cache.inc.php

@@ -79 +79 @@
 
         if (true !== $app->getParam('enable_session')) {
+            // Force disable the cache because there is no session to save to.
             $app->logMsg('Cache disabled, enable_session is false.', LOG_DEBUG, __FILE__, __LINE__);
             $this->setParam(array('enabled' => false));
-        }
-
-        if (!isset($_SESSION['_cache'][$this->_ns])) {
+        } else if (!isset($_SESSION['_cache'][$this->_ns])) {
+            // Otherwise, clear to initialize the session variable.
             $this->clear();
         }
@@ -252 +252 @@
     public function delete($key)
     {
+        $app =& App::getInstance();
+
+        if (true !== $this->getParam('enabled')) {
+            $app->logMsg(sprintf('Cache disabled, skipping delete of %s', $key), LOG_DEBUG, __FILE__, __LINE__);
+            return false;
+        }
+
         if (isset($_SESSION['_cache'][$this->_ns]) && array_key_exists($key, $_SESSION['_cache'][$this->_ns])) {
             unset($_SESSION['_cache'][$this->_ns][$key]);