GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.9.x' into socialbookmark

Browse Source
This commit is contained in:
Evan Prodromou 2010-12-27 22:13:23 -08:00
commit 1cc8be4d8b
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
EVENTS.txt
View File

@ -970,6 +970,7 @@ EndRevokeRole: when a role has been revoked
StartAtomPubNewActivity: When a new activity comes in through Atom Pub API StartAtomPubNewActivity: When a new activity comes in through Atom Pub API
- &$activity: received activity - &$activity: received activity
- $user: user publishing the entry - $user: user publishing the entry
- &$notice: notice created; initially null, can be set
EndAtomPubNewActivity: When a new activity comes in through Atom Pub API EndAtomPubNewActivity: When a new activity comes in through Atom Pub API
- $activity: received activity - $activity: received activity

4
actions/apitimelineuser.php
View File

@ -324,7 +324,9 @@ class ApiTimelineUserAction extends ApiBareAuthAction
$activity = new Activity($dom->documentElement); $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) { if ($activity->verb != ActivityVerb::POST) {
// TRANS: Client error displayed when not using the POST verb. // TRANS: Client error displayed when not using the POST verb.