From 7642f008fb58b5025b93f58b2663ff9f4d161edf Mon Sep 17 00:00:00 2001
From: Mikael Nordfeldth <mmn@hethane.se>
Date: Sat, 28 Jun 2014 12:58:24 +0200
Subject: [PATCH] Bad error message in atompubmembershipfeed

---
 actions/atompubmembershipfeed.php | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/actions/atompubmembershipfeed.php b/actions/atompubmembershipfeed.php
index e5ca8b0a5a..2ebd45bc80 100644
--- a/actions/atompubmembershipfeed.php
+++ b/actions/atompubmembershipfeed.php
@@ -237,15 +237,13 @@ class AtompubmembershipfeedAction extends ApiAuthAction
             if ($activity->verb != ActivityVerb::JOIN) {
                 // TRANS: Client error displayed when not using the join verb.
                 throw new ClientException(_('Can only handle join activities.'));
-                return;
             }
 
             $groupObj = $activity->objects[0];
 
             if ($groupObj->type != ActivityObject::GROUP) {
-                // TRANS: Client exception thrown when trying favorite an object that is not a notice.
-                throw new ClientException(_('Can only fave notices.'));
-                return;
+                // TRANS: Client exception thrown when trying to join something which is not a group
+                throw new ClientException(_('Can only join groups.'));
             }
 
             $group = User_group::getKV('uri', $groupObj->id);