summaryrefslogtreecommitdiff
path: root/plugins/UserFlag
diff options
context:
space:
mode:
authorZach Copley <zach@status.net>2010-01-06 16:24:25 -0800
committerZach Copley <zach@status.net>2010-01-06 16:24:25 -0800
commit5d13126c88a8143a1628cc52c2dae4581f134273 (patch)
tree8a0add7ba172f63b180b1f6d57a74f26ea9a1801 /plugins/UserFlag
parenta1c3a2d3a12c1667492e4107007b31ec3a1f9c7b (diff)
parent5d9a2eb17e3f6e3bc73b5aa80625a365761b6689 (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'plugins/UserFlag')
-rw-r--r--plugins/UserFlag/User_flag_profile.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/plugins/UserFlag/User_flag_profile.php b/plugins/UserFlag/User_flag_profile.php
index 658259452..063ed04ea 100644
--- a/plugins/UserFlag/User_flag_profile.php
+++ b/plugins/UserFlag/User_flag_profile.php
@@ -97,7 +97,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);
}