MDL-36466 cache: renamed define NO_CACHE_STORES to CACHE_DISABLE_STORES

diff --git a/cache/classes/factory.php b/cache/classes/factory.php
index cadce01..0a3065b 100644 (file)
--- a/cache/classes/factory.php
+++ b/cache/classes/factory.php
@@ -110,7 +110,7 @@ class cache_factory {
     public static function instance($forcereload = false) {
         if ($forcereload || self::$instance === null) {
             self::$instance = new cache_factory();
-            if (defined('NO_CACHE_STORES') && NO_CACHE_STORES !== false) {
+            if (defined('CACHE_DISABLE_STORES') && CACHE_DISABLE_STORES !== false) {
                 // The cache stores have been disabled.
                 self::$instance->set_state(self::STATE_DISABLED);;
             }

diff --git a/lib/setup.php b/lib/setup.php
index 1b53e75..ccc4d4e 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -142,8 +142,8 @@ if (!defined('PHPUNIT_TEST')) {
 // The Cache API will continue to function however this will force the use of the cachestore_dummy so all requests
 // will be interacting with a static property and will never go to the proper cache stores.
 // Useful if you need to avoid the stores for one reason or another.
-if (!defined('NO_CACHE_STORES')) {
-    define('NO_CACHE_STORES', false);
+if (!defined('CACHE_DISABLE_STORES')) {
+    define('CACHE_DISABLE_STORES', false);
 }
 
 // Servers should define a default timezone in php.ini, but if they don't then make sure something is defined.