Misses this file to merge. I like the comments.

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

diff --git a/actions/smssettings.php b/actions/smssettings.php
index d8e219db413c4c8dcbc60d01c44b68d84a83657b..ec8841281d2bf07c544910080002aacd7181e556 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -436,21 +436,14 @@ class SmssettingsAction extends SettingsAction
             return;
         }
 
-        $user->query('BEGIN');
-
         $original = clone($user);
 
         $user->sms      = null;
         $user->carrier  = null;
         $user->smsemail = null;
 
-        $result = $user->updateKeys($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.'));
-        }
-        $user->query('COMMIT');
+        // Throws exception on failure. Also performs it within a transaction.
+        $user->updateWithKeys($original);
 
         // TRANS: Message given after successfully removing a registered SMS phone number.
         $this->showForm(_('The SMS phone number was removed.'), true);
@@ -556,11 +549,8 @@ class SmssettingsAction extends SettingsAction
 
         $user->incomingemail = null;
 
-        if (!$user->updateKeys($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.'));
-        }
+        // Throws exception on failure. Also performs it within a transaction.
+        $user->updateWithKeys($orig);
 
         // TRANS: Confirmation text after updating SMS settings.
         $this->showForm(_('Incoming email address removed.'), true);
@@ -581,11 +571,8 @@ class SmssettingsAction extends SettingsAction
 
         $user->incomingemail = mail_new_incoming_address();
 
-        if (!$user->updateKeys($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.'));
-        }
+        // Throws exception on failure. Also performs it within a transaction.
+        $user->updateWithKeys($orig);
 
         // TRANS: Confirmation text after updating SMS settings.
         $this->showForm(_('New incoming email address added.'), true);