Cope with missing Memcache.

mysociety · Dec 18, 2023 · 4ffc97d · 4ffc97d
1 parent fd6b634
commit 4ffc97d
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/classes/Memcache.php b/classes/Memcache.php
@@ -17,14 +17,17 @@ public function __construct() {
             if (class_exists('\Memcached')) {
                 self::$memcache = new \Memcached;
                 self::$memcache->addServer(OPTION_TWFY_MEMCACHED_HOST, OPTION_TWFY_MEMCACHED_PORT);
-            } else {
+            } elseif (class_exists('\Memcache')) {
                 self::$memcache = new \Memcache;
                 self::$memcache->connect(OPTION_TWFY_MEMCACHED_HOST, OPTION_TWFY_MEMCACHED_PORT);
             }
         }
     }
 
     public function set($key, $value, $timeout = 3600) {
+        if (!self::$memcache) {
+            return;
+        }
         if (class_exists('\Memcached')) {
             self::$memcache->set(OPTION_TWFY_DB_NAME.':'.$key, $value, $timeout);
         } else {
@@ -37,7 +40,7 @@ public function get($key) {
         $was_found = false;
         if (class_exists('\Memcached')) {
             $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, null, $was_found);
-        } else {
+        } elseif (class_exists('\Memcache')) {
             $value = self::$memcache->get(OPTION_TWFY_DB_NAME.':'.$key, $was_found);
         }
         if ($was_found === false) {