Merge commit 'refs/merge-requests/43' of https://gitorious.org/social/mainline into...

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

diff --git a/classes/Group_member.php b/classes/Group_member.php
index 1c37abab14bf265baf84dc8c081c21a28837c6a7..14f417758da21890fecf21a944cdc77891c3beb8 100644 (file)
--- a/classes/Group_member.php
+++ b/classes/Group_member.php
@@ -48,11 +48,6 @@ class Group_member extends Managed_DataObject
         );
     }
 
-    function pkeyGet($kv)
-    {
-        return Memcached_DataObject::pkeyGet('Group_member', $kv);
-    }
-
     /**
      * Method to add a user to a group.
      * In most cases, you should call Profile->joinGroup() instead.
@@ -173,7 +168,7 @@ class Group_member extends Managed_DataObject
 
         $act->id = $this->getURI();
 
-        $act->actor     = ActivityObject::fromProfile($member);
+        $act->actor     = $member->asActivityObject();
         $act->verb      = ActivityVerb::JOIN;
         $act->objects[] = ActivityObject::fromGroup($group);