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

Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing

This commit is contained in:
Brion Vibber 2010-03-18 15:39:04 -07:00
parent c8e3d08a8f 109aac3c49
commit b149b88953
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
actions/apistatusesupdate.php
View File

@ -244,11 +244,17 @@ class ApiStatusesUpdateAction extends ApiAuthAction
$options = array_merge($options, $locOptions); $options = array_merge($options, $locOptions);
} }
$this->notice = try {
Notice::saveNew($this->auth_user->id, $this->notice = Notice::saveNew(
$content, $this->auth_user->id,
$this->source, $content,
$options); $this->source,
$options
);
} catch (Exception $e) {
$this->clientError($e->getMessage());
return;
}
if (isset($upload)) { if (isset($upload)) {
$upload->attachToNotice($this->notice); $upload->attachToNotice($this->notice);