Added Snapshot::check() to main function for index.php

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

diff --git a/classes/Memcached_DataObject.php b/classes/Memcached_DataObject.php
index c670e99c8bebddc05df573916a55ce0e66d73be4..5f71f716b3dd569f84ef557420b03517ecc7c2f9 100644 (file)
--- a/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@ -208,7 +208,7 @@ class Memcached_DataObject extends DB_DataObject
         if (!$c) {
             $inst = new $cls();
             $inst->query($qry);
-            return $cls;
+            return $inst;
         }
         $key_part = common_keyize($cls).':'.md5($qry);
         $ckey = common_cache_key($key_part);
@@ -218,16 +218,13 @@ class Memcached_DataObject extends DB_DataObject
         }
 
         $inst = new $cls();
-        $result = $inst->query($qry);
-        if (!$result) {
-            return $inst;
-        }
+        $inst->query($qry);
         $cached = array();
         while ($inst->fetch()) {
             $cached[] = clone($inst);
         }
         $inst->free();
         $c->set($ckey, $cached, MEMCACHE_COMPRESSED, $expiry);
-        return ArrayWrapper($cached);
+        return new ArrayWrapper($cached);
     }
 }