Merge branch '0.9.x' into socialbookmark
This commit is contained in:
commit
1cc8be4d8b
|
@ -970,6 +970,7 @@ EndRevokeRole: when a role has been revoked
|
|||
StartAtomPubNewActivity: When a new activity comes in through Atom Pub API
|
||||
- &$activity: received activity
|
||||
- $user: user publishing the entry
|
||||
- &$notice: notice created; initially null, can be set
|
||||
|
||||
EndAtomPubNewActivity: When a new activity comes in through Atom Pub API
|
||||
- $activity: received activity
|
||||
|
|
|
@ -324,7 +324,9 @@ class ApiTimelineUserAction extends ApiBareAuthAction
|
|||
|
||||
$activity = new Activity($dom->documentElement);
|
||||
|
||||
if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user))) {
|
||||
$saved = null;
|
||||
|
||||
if (Event::handle('StartAtomPubNewActivity', array(&$activity, $this->user, &$saved))) {
|
||||
|
||||
if ($activity->verb != ActivityVerb::POST) {
|
||||
// TRANS: Client error displayed when not using the POST verb.
|
||||
|
|
Loading…
Reference in New Issue
Block a user