summaryrefslogtreecommitdiff
path: root/actions/smssettings.php
diff options
context:
space:
mode:
authorsarven <csarven@plantard.controlezvous.ca>2009-01-15 23:05:57 +0000
committersarven <csarven@plantard.controlezvous.ca>2009-01-15 23:05:57 +0000
commit0357ea505dd8aba293a67f0bfa122c3bbd29e51b (patch)
tree2329651d23e2795cef00ea80bd1b252c7510fc94 /actions/smssettings.php
parent8d9fb7711f32f7b7c0676641dd0c2b9343a5666f (diff)
parent4b0cf99e56f965e10eeb8b8b19e7b405bda49eaf (diff)
Merge branch 'uiredesign' of ../evan into uiredesign
Diffstat (limited to 'actions/smssettings.php')
-rw-r--r--actions/smssettings.php8
1 files changed, 4 insertions, 4 deletions
diff --git a/actions/smssettings.php b/actions/smssettings.php
index 1be45d1ce..c5879e4d9 100644
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -168,7 +168,7 @@ class SmssettingsAction extends EmailsettingsAction
if ($result === false) {
common_log_db_error($user, 'UPDATE', __FILE__);
- common_server_error(_('Couldn\'t update user.'));
+ $this->serverError(_('Couldn\'t update user.'));
return;
}
@@ -218,7 +218,7 @@ class SmssettingsAction extends EmailsettingsAction
if ($result === false) {
common_log_db_error($confirm, 'INSERT', __FILE__);
- common_server_error(_('Couldn\'t insert confirmation code.'));
+ $this->serverError(_('Couldn\'t insert confirmation code.'));
return;
}
@@ -254,7 +254,7 @@ class SmssettingsAction extends EmailsettingsAction
if (!$result) {
common_log_db_error($confirm, 'DELETE', __FILE__);
- $this->server_error(_('Couldn\'t delete email confirmation.'));
+ $this->serverError(_('Couldn\'t delete email confirmation.'));
return;
}
@@ -283,7 +283,7 @@ class SmssettingsAction extends EmailsettingsAction
$result = $user->updateKeys($original);
if (!$result) {
common_log_db_error($user, 'UPDATE', __FILE__);
- common_server_error(_('Couldn\'t update user.'));
+ $this->serverError(_('Couldn\'t update user.'));
return;
}
$user->query('COMMIT');