]> git.mxchange.org Git - quix0rs-gnu-social.git/commitdiff
Bad error message in atompubmembershipfeed
authorMikael Nordfeldth <mmn@hethane.se>
Sat, 28 Jun 2014 10:58:24 +0000 (12:58 +0200)
committerMikael Nordfeldth <mmn@hethane.se>
Sat, 28 Jun 2014 10:58:24 +0000 (12:58 +0200)
actions/atompubmembershipfeed.php

index e5ca8b0a5a3251d7241fe0f2122a41c100cecffb..2ebd45bc8075c9ff889ced95df876c7baa1ab986 100644 (file)
@@ -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);