From: skodak <skodak>
Date: Tue, 11 Mar 2008 09:05:20 +0000 (+0000)
Subject: MDL-13881 fixed silly logic bug when disabling rcache - patch by Matt Clarkson; merge... 
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=0a2925beb9c78b1f6e0ae305fa1bdd5e13f372f4;p=moodle.git

MDL-13881 fixed silly logic bug when disabling rcache - patch by Matt Clarkson; merged from MOODLE_19_STABLE
---

diff --git a/lib/setup.php b/lib/setup.php
index 77c77b3677..2be58369f1 100644
--- 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