diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-01-26 01:59:36 +0100 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-01-26 01:59:36 +0100 |
| commit | 94aca655ef4128859285b86a78f85537aa9848e8 (patch) | |
| tree | 15f353bc93dc5900868624d3d884ba8b11bba82c /actions | |
| parent | 1cc86baba6ae5062d87c14d6108a2a494b6c53ce (diff) | |
| parent | b6aa1511eb868d740f8893160ce8bef387725867 (diff) | |
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Diffstat (limited to 'actions')
| -rw-r--r-- | actions/apistatusesretweet.php | 2 | ||||
| -rw-r--r-- | actions/apistatusesupdate.php | 2 | ||||
| -rw-r--r-- | actions/newnotice.php | 2 | ||||
| -rw-r--r-- | actions/repeat.php | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index d9d4820c0..128c881e2 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -112,7 +112,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $repeat = $this->original->repeat($this->user->id, $this->source); - common_broadcast_notice($repeat); + $this->showNotice($repeat); } diff --git a/actions/apistatusesupdate.php b/actions/apistatusesupdate.php index f8bf7cf87..31c9b20ce 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -255,7 +255,7 @@ class ApiStatusesUpdateAction extends ApiAuthAction $upload->attachToNotice($this->notice); } - common_broadcast_notice($this->notice); + } $this->showNotice(); diff --git a/actions/newnotice.php b/actions/newnotice.php index a4ed87bb6..78480abab 100644 --- a/actions/newnotice.php +++ b/actions/newnotice.php @@ -201,7 +201,7 @@ class NewnoticeAction extends Action $upload->attachToNotice($notice); } - common_broadcast_notice($notice); + if ($this->boolean('ajax')) { header('Content-Type: text/xml;charset=utf-8'); diff --git a/actions/repeat.php b/actions/repeat.php index b75523498..e112496bc 100644 --- a/actions/repeat.php +++ b/actions/repeat.php @@ -106,7 +106,7 @@ class RepeatAction extends Action { $repeat = $this->notice->repeat($this->user->id, 'web'); - common_broadcast_notice($repeat); + if ($this->boolean('ajax')) { $this->startHTML('text/xml;charset=utf-8'); |