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

2010-01-06 23:23:30 -08:00
parent e1c7851a06 5d13126c88
commit a55939f3b1
38 changed files with 1364 additions and 98 deletions
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -108,7 +108,7 @@ class User_flag_profile extends Memcached_DataObject
     * @return User_flag_profile found object or null
     */

-    function &pkeyGet($kv)
+    function pkeyGet($kv)
    {
        return Memcached_DataObject::pkeyGet('User_flag_profile', $kv);
    }