diff options
author | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 23:05:57 +0000 |
---|---|---|
committer | sarven <csarven@plantard.controlezvous.ca> | 2009-01-15 23:05:57 +0000 |
commit | 0357ea505dd8aba293a67f0bfa122c3bbd29e51b (patch) | |
tree | 2329651d23e2795cef00ea80bd1b252c7510fc94 /actions/subedit.php | |
parent | 8d9fb7711f32f7b7c0676641dd0c2b9343a5666f (diff) | |
parent | 4b0cf99e56f965e10eeb8b8b19e7b405bda49eaf (diff) |
Merge branch 'uiredesign' of ../evan into uiredesign
Diffstat (limited to 'actions/subedit.php')
-rw-r--r-- | actions/subedit.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/actions/subedit.php b/actions/subedit.php index 1142b7a03..e22384869 100644 --- a/actions/subedit.php +++ b/actions/subedit.php @@ -30,28 +30,28 @@ class SubeditAction extends Action parent::prepare($args); if (!common_logged_in()) { - $this->client_error(_('Not logged in.')); + $this->clientError(_('Not logged in.')); return false; } $token = $this->trimmed('token'); if (!$token || $token != common_session_token()) { - $this->client_error(_('There was a problem with your session token. Try again, please.')); + $this->clientError(_('There was a problem with your session token. Try again, please.')); return; } $id = $this->trimmed('profile'); if (!$id) { - $this->client_error(_('No profile specified.')); + $this->clientError(_('No profile specified.')); return false; } $this->profile = Profile::staticGet('id', $id); if (!$this->profile) { - $this->client_error(_('No profile with that ID.')); + $this->clientError(_('No profile with that ID.')); return false; } @@ -68,7 +68,7 @@ class SubeditAction extends Action 'subscribed' => $this->profile->id)); if (!$sub) { - $this->client_error(_('You are not subscribed to that profile.')); + $this->clientError(_('You are not subscribed to that profile.')); return false; } @@ -81,7 +81,7 @@ class SubeditAction extends Action if (!$result) { common_log_db_error($sub, 'UPDATE', __FILE__); - $this->server_error(_('Could not save subscription.')); + $this->serverError(_('Could not save subscription.')); return false; } |