MDL-13881 fixed silly logic bug when disabling rcache - patch by Matt Clarkson; merge...

diff --git a/lib/setup.php b/lib/setup.php
index 77c77b367789017de50a195fb7d4355ff3119481..2be58369f1e926ae456fa238134c8cbdb52fa31e 100644 (file)
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -311,15 +311,15 @@ global $HTTPSPAGEREQUIRED;
         if ($CFG->cachetype === 'memcached' && !empty($CFG->memcachedhosts)) {
             if (!init_memcached()) {
                 debugging("Error initialising memcached");
+                $CFG->cachetype = '';
+                $CFG->rcache = false;
             }
-            $CFG->cachetype = '';
-            $CFG->rcache = false;
         } else if ($CFG->cachetype === 'eaccelerator') {
             if (!init_eaccelerator()) {
                 debugging("Error initialising eaccelerator cache");
+                $CFG->cachetype = '';
+                $CFG->rcache = false;                
             }
-            $CFG->cachetype = '';
-            $CFG->rcache = false;
         }
 
     } else { // just make sure it is defined