updateWithKeys reworked to more reliable execution

[quix0rs-gnu-social.git] / actions / smssettings.php

diff --git a/actions/smssettings.php b/actions/smssettings.php
index a39eb2cf57bab84e63e810707117c18b4911da8e..ec2fcfd89e94cd6694eb88280f45121c6659f934 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -299,7 +299,6 @@ class SmssettingsAction extends SettingsAction
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error updating SMS preferences.
             $this->serverError(_('Could not update user.'));
-            return;
         }
 
         $user->query('COMMIT');
@@ -363,7 +362,6 @@ class SmssettingsAction extends SettingsAction
             common_log_db_error($confirm, 'INSERT', __FILE__);
             // TRANS: Server error thrown on database error adding SMS confirmation code.
             $this->serverError(_('Could not insert confirmation code.'));
-            return;
         }
 
         $carrier = Sms_carrier::getKV($carrier_id);
@@ -411,7 +409,6 @@ class SmssettingsAction extends SettingsAction
             common_log_db_error($confirm, 'DELETE', __FILE__);
             // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
             $this->serverError(_('Could not delete SMS confirmation.'));
-            return;
         }
 
         // TRANS: Message given after successfully canceling SMS phone number confirmation.
@@ -447,12 +444,11 @@ class SmssettingsAction extends SettingsAction
         $user->carrier  = null;
         $user->smsemail = null;
 
-        $result = $user->updateKeys($original);
+        $result = $user->updateWithKeys($original);
         if (!$result) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error thrown on database error removing a registered SMS phone number.
             $this->serverError(_('Could not update user.'));
-            return;
         }
         $user->query('COMMIT');
 
@@ -560,7 +556,7 @@ class SmssettingsAction extends SettingsAction
 
         $user->incomingemail = null;
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error displayed when the user could not be updated in SMS settings.
             $this->serverError(_('Could not update user record.'));
@@ -585,7 +581,7 @@ class SmssettingsAction extends SettingsAction
 
         $user->incomingemail = mail_new_incoming_address();
 
-        if (!$user->updateKeys($orig)) {
+        if (!$user->updateWithKeys($orig)) {
             common_log_db_error($user, 'UPDATE', __FILE__);
             // TRANS: Server error displayed when the user could not be updated in SMS settings.
             $this->serverError(_('Could not update user record.'));