diff options
author | Craig Andrews <candrews@integralblue.com> | 2010-01-27 13:41:02 -0500 |
---|---|---|
committer | Craig Andrews <candrews@integralblue.com> | 2010-01-27 13:41:02 -0500 |
commit | 5224c7d6c263f078c3628650ff2b4b706862307c (patch) | |
tree | 9ce11b5470dfe1f64a8944dccb120f628a377e09 /actions | |
parent | 767b77d6c2291d6e7f4795ce18c70d5354a07de9 (diff) | |
parent | 656d95418c6d7f8b884c4c8af14ad6952032ace6 (diff) |
Merge branch '0.9.x' into 1.0.x
Diffstat (limited to 'actions')
-rw-r--r-- | actions/apiaccountupdateprofile.php | 4 | ||||
-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 |
5 files changed, 6 insertions, 6 deletions
diff --git a/actions/apiaccountupdateprofile.php b/actions/apiaccountupdateprofile.php index fd4384a25..9b371ea95 100644 --- a/actions/apiaccountupdateprofile.php +++ b/actions/apiaccountupdateprofile.php @@ -115,11 +115,11 @@ class ApiAccountUpdateProfileAction extends ApiAuthAction $original = clone($profile); - if (empty($this->name)) { + if (!empty($this->name)) { $profile->fullname = $this->name; } - if (empty($this->url)) { + if (!empty($this->url)) { $profile->homepage = $this->url; } 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'); |