X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fatompubmembershipfeed.php;h=37e4a386a20cfb27e4f4ec6f85f4ced8f55ed3f4;hb=c48cdc7d50cc2920e3f41e34e9b5e19638331dd9;hp=57cf465a0c13373fa791dd89a45faf24b54da6a9;hpb=adaad5bb5ea45c7647f5c1de881881861d85ae39;p=quix0rs-gnu-social.git

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index 57cf465a0c..37e4a386a2 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -141,12 +141,12 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         // TRANS: Title for group membership feed.
         // TRANS: %s is a username.
-        $feed->setTitle(sprintf(_("%s group memberships"),
+        $feed->setTitle(sprintf(_('Group memberships of %s'),
                                 $this->_profile->getBestName()));
 
         // TRANS: Subtitle for group membership feed.
         // TRANS: %1$s is a username, %2$s is the StatusNet sitename.
-        $feed->setSubtitle(sprintf(_("Groups %1$s is a member of on %2$s"),
+        $feed->setSubtitle(sprintf(_('Groups %1$s is a member of on %2$s'),
                                    $this->_profile->getBestName(),
                                    common_config('site', 'name')));
 
@@ -237,8 +237,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
 
         if (Event::handle('StartAtomPubNewActivity', array(&$activity))) {
             if ($activity->verb != ActivityVerb::JOIN) {
-                // TRANS: Client error displayed when not using the POST verb.
-                // TRANS: Do not translate POST.
+                // TRANS: Client error displayed when not using the join verb.
                 throw new ClientException(_('Can only handle join activities.'));
                 return;
             }
@@ -275,10 +274,7 @@ class AtompubmembershipfeedAction extends ApiAuthAction
                 throw new ClientException(_('Blocked by admin.'));
             }
 
-            if (Event::handle('StartJoinGroup', array($group, $this->auth_user))) {
-                $membership = Group_member::join($group->id, $this->auth_user->id);
-                Event::handle('EndJoinGroup', array($group, $this->auth_user));
-            }
+            $this->auth_user->joinGroup($group);
 
             Event::handle('EndAtomPubNewActivity', array($activity, $membership));
         }