diff options
author | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
---|---|---|
committer | Evan Prodromou <evan@status.net> | 2009-12-15 16:24:52 -0500 |
commit | 2a1468ec8b2918553b490ddaef6bdede3e2d5b1b (patch) | |
tree | c94a68a1239a5a3c35d5564323967fcd4ff14523 /actions/apistatusesupdate.php | |
parent | e9b733e7f036bc03353ae6dd7b096ea179698a4d (diff) | |
parent | f3d27cc3ae92e2b7412dd998d7de7a2b58dc8e6a (diff) |
Merge branch '0.9.x' into testing
Diffstat (limited to 'actions/apistatusesupdate.php')
-rw-r--r-- | actions/apistatusesupdate.php | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index 85a7c8c08..dabbea92f 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -231,19 +231,22 @@ class ApiStatusesUpdateAction extends ApiAuthAction } } - $this->notice = Notice::saveNew( - $this->user->id, - html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'), - $this->source, - 1, - $reply_to, - null, - null, - empty($location) ? null : $location->lat, - empty($location) ? null : $location->lon, - empty($location) ? null : $location->location_id, - empty($location) ? null : $location->location_ns - ); + $content = html_entity_decode($status_shortened, ENT_NOQUOTES, 'UTF-8'); + + $options = array('reply_to' => $reply_to); + + if (!empty($location)) { + $options['lat'] = $location->lat; + $options['lon'] = $location->lon; + $options['location_id'] = $location->location_id; + $options['location_ns'] = $location->location_ns; + } + + $this->notice = + Notice::saveNew($this->user->id, + $content, + $this->source, + $options); if (isset($upload)) { $upload->attachToNotice($this->notice); |