diff options
author | Brion Vibber <brion@pobox.com> | 2010-10-28 16:27:53 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-10-28 16:27:53 -0700 |
commit | e7c7fd39fc948f1169512916077185dd29973b60 (patch) | |
tree | 6fe8c025a308d423c87444a5daa5da1d02d62182 /actions/apistatusesretweet.php | |
parent | b483a0549f115b2d5f2cfb3d447e6cc5c4f469f3 (diff) | |
parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) |
Merge branch '1.0.x' into schema-x
Conflicts:
plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
Diffstat (limited to 'actions/apistatusesretweet.php')
-rw-r--r-- | actions/apistatusesretweet.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/actions/apistatusesretweet.php b/actions/apistatusesretweet.php index aae98f637..ecc4a3f03 100644 --- a/actions/apistatusesretweet.php +++ b/actions/apistatusesretweet.php @@ -43,7 +43,6 @@ require_once INSTALLDIR . '/lib/mediafile.php'; * @license http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0 * @link http://status.net/ */ - class ApiStatusesRetweetAction extends ApiAuthAction { var $original = null; @@ -54,9 +53,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction * @param array $args $_REQUEST args * * @return boolean success flag - * */ - function prepare($args) { parent::prepare($args); @@ -73,6 +70,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->original = Notice::staticGet('id', $id); if (empty($this->original)) { + // TRANS: Client error displayed trying to repeat a non-existing notice through the API. $this->clientError(_('No such notice.'), 400, $this->format); return false; @@ -81,6 +79,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $this->user = $this->auth_user; if ($this->user->id == $this->original->profile_id) { + // TRANS: Client error displayed trying to repeat an own notice through the API. $this->clientError(_('Cannot repeat your own notice.'), 400, $this->format); return false; @@ -89,6 +88,7 @@ class ApiStatusesRetweetAction extends ApiAuthAction $profile = $this->user->getProfile(); if ($profile->hasRepeated($id)) { + // TRANS: Client error displayed trying to re-repeat a notice through the API. $this->clientError(_('Already repeated that notice.'), 400, $this->format); return false; @@ -106,15 +106,12 @@ class ApiStatusesRetweetAction extends ApiAuthAction * * @return void */ - function handle($args) { parent::handle($args); $repeat = $this->original->repeat($this->user->id, $this->source); - - $this->showNotice($repeat); } @@ -123,7 +120,6 @@ class ApiStatusesRetweetAction extends ApiAuthAction * * @return void */ - function showNotice($notice) { if (!empty($notice)) { |