diff options
| author | Sarven Capadisli <csarven@status.net> | 2010-01-26 01:29:10 +0100 |
|---|---|---|
| committer | Sarven Capadisli <csarven@status.net> | 2010-01-26 01:29:10 +0100 |
| commit | 6cfe5b5a3bfe4cbdecc6adf39f8f7b133fbd7550 (patch) | |
| tree | f9314cb28d7fbe56c5ab0d3d0ac6211036eb61c8 /actions | |
| parent | 9bacdb9134b39f97fd244bdc28d9e467ac05b61d (diff) | |
| parent | e26a843caf9f6bb0d11a7128884db235ededcce0 (diff) | |
Merge branch 'master' of git@gitorious.org:statusnet/mainline
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 f594bbf39..9d831b9db 100644 --- a/actions/apistatusesupdate.php +++ b/actions/apistatusesupdate.php @@ -250,7 +250,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'); |