Merge branch '1.0.x' into limitdist2

This commit is contained in:
Evan Prodromou 2011-03-28 10:04:45 -04:00
commit 133def8370

View File

@ -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;
}