Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --combined classes/Memcached_DataObject.php
index 15ca3482183e45d5667a70ad1cdba5ae27eda38b,04f75b775c7c0ac9df106634ac946a39931058d6..4e3cc5678867d26e6d2f6cf47b9cf1b9b1a51433
--- 1/classes/Memcached_DataObject.php
--- 2/classes/Memcached_DataObject.php
+++ b/classes/Memcached_DataObject.php
@@@ -90,17 -90,16 +90,16 @@@ class Memcached_DataObject extends DB_D
              unset($i);
          }
          $i = Memcached_DataObject::getcached($cls, $k, $v);
-         if ($i !== false) { // false == cache miss
-             return $i;
-         } else {
+         if ($i === false) { // false == cache miss
              $i = DB_DataObject::factory($cls);
              if (empty($i)) {
-                 return false;
+                 $i = false;
+                 return $i;
              }
              $result = $i->get($k, $v);
              if ($result) {
+                 // Hit!
                  $i->encache();
-                 return $i;
              } else {
                  // save the fact that no such row exists
                  $c = self::memcache();
@@@ -108,12 -107,16 +107,16 @@@
                      $ck = self::cachekey($cls, $k, $v);
                      $c->set($ck, null);
                  }
-                 return false;
+                 $i = false;
              }
          }
+         return $i;
      }
  
-     function &pkeyGet($cls, $kv)
+     /**
+      * @fixme Should this return false on lookup fail to match staticGet?
+      */
+     function pkeyGet($cls, $kv)
      {
          $i = Memcached_DataObject::multicache($cls, $kv);
          if ($i !== false) { // false == cache miss
@@@ -143,9 -146,7 +146,9 @@@
      function insert()
      {
          $result = parent::insert();
 -        $this->encache(); // in case of cached negative lookups
 +        if ($result) {
 +            $this->encache(); // in case of cached negative lookups
 +        }
          return $result;
      }
  

diff --combined plugins/UserFlag/User_flag_profile.php
index 6bf47071b26b84f2bfdeb9e95b07db7a42634d4c,063ed04eac961ac790762799fe3a10399f683073..bc4251cf7f11010d62128c4d196e0cd9602c86c7
--- 1/plugins/UserFlag/User_flag_profile.php
--- 2/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@@ -89,17 -89,6 +89,17 @@@ class User_flag_profile extends Memcach
          return array('profile_id' => 'N', 'user_id' => 'N');
      }
  
 +    /**
 +     * return key definitions for DB_DataObject
 +     *
 +     * @return array key definitions
 +     */
 +
 +    function keyTypes()
 +    {
 +        return $this->keys();
 +    }
 +
      /**
       * Get a single object with multiple keys
       *
@@@ -108,7 -97,7 +108,7 @@@
       * @return User_flag_profile found object or null
       */
  
-     function &pkeyGet($kv)
+     function pkeyGet($kv)
      {
          return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
      }