Merge pull request #1137 from fauvel/issue-981

CM_Model_Location::create* not db-slave-compliant (cont'd)
cargomedia · May 9, 2014 · 0d8b665 · 0d8b665
2 parents 5522e6d + d606f75
commit 0d8b665
Show file tree

Hide file tree

Showing 18 changed files with 757 additions and 226 deletions.
diff --git a/library/CM/Class/Abstract.php b/library/CM/Class/Abstract.php
@@ -52,7 +52,9 @@ protected static function _getConfig() {
         $cache = new CM_Cache_Storage_Apc();
         if (!self::$_classConfigCacheEnabled || false === ($result = $cache->get($cacheKey))) {
             $result = self::_getConfigRaw();
-            $cache->set($cacheKey, $result);
+            if (self::$_classConfigCacheEnabled) {
+                $cache->set($cacheKey, $result);
+            }
         }
         return $result;
     }

diff --git a/library/CM/Debug.php b/library/CM/Debug.php
@@ -18,6 +18,14 @@ public function __construct($enabled) {
         $this->_enabled = (bool) $enabled;
     }
 
+    /**
+     * @return array[]
+     */
+
+    public function getStats() {
+        return $this->_stats;
+    }
+
     /**
      * @param string          $key
      * @param string|string[] $value
@@ -33,11 +41,17 @@ public function incStats($key, $value) {
     }
 
     /**
-     * @return array[]
+     * @return bool
      */
+    public function isEnabled() {
+        return $this->_enabled;
+    }
 
-    public function getStats() {
-        return $this->_stats;
+    /**
+     * @param bool $state
+     */
+    public function setEnabled($state) {
+        $this->_enabled = $state;
     }
 
     /**