Merge branch '0.9.x' into 1.0.x

[quix0rs-gnu-social.git] / classes / Config.php

diff --git a/classes/Config.php b/classes/Config.php
index 390d75381ac82fb74289a91fc6a77a011d875da0..e14730438eb306936c81652c6b8897df04398ea8 100644 (file)
--- a/classes/Config.php
+++ b/classes/Config.php
@@ -58,8 +58,8 @@ class Config extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $settings = $c->get(common_cache_key(self::settingsKey));
-            if (!empty($settings)) {
+            $settings = $c->get(Cache::key(self::settingsKey));
+            if ($settings !== false) {
                 return $settings;
             }
         }
@@ -77,7 +77,7 @@ class Config extends Memcached_DataObject
         $config->free();
 
         if (!empty($c)) {
-            $c->set(common_cache_key(self::settingsKey), $settings);
+            $c->set(Cache::key(self::settingsKey), $settings);
         }
 
         return $settings;
@@ -120,7 +120,7 @@ class Config extends Memcached_DataObject
         return $result;
     }
 
-    function &pkeyGet($kv)
+    function pkeyGet($kv)
     {
         return Memcached_DataObject::pkeyGet('Config', $kv);
     }
@@ -154,7 +154,7 @@ class Config extends Memcached_DataObject
         $c = self::memcache();
 
         if (!empty($c)) {
-            $c->delete(common_cache_key(self::settingsKey));
+            $c->delete(Cache::key(self::settingsKey));
         }
     }
 }