Commit 133def83 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '1.0.x' into limitdist2

parents c1fd36c0 52d29a17
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment