Merge branch 'nightly' of https://git.gnu.io/gnu/gnu-social into nightly

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

diff --git a/actions/smssettings.php b/actions/smssettings.php
index ca6a7d04efdec803cd5ebe2a2483b10d8b60e8be..c002474ce2ae912b2c1ea67bd3d4471f7dfc73fd 100644 (file)
--- a/actions/smssettings.php
+++ b/actions/smssettings.php
@@ -368,13 +368,7 @@ class SmssettingsAction extends SettingsAction
             throw new AlreadyFulfilledException(_('No pending confirmation to cancel.'));
         }
 
-        $result = $confirm->delete();
-
-        if ($result === false) {
-            common_log_db_error($confirm, 'DELETE', __FILE__);
-            // TRANS: Server error thrown on database error canceling SMS phone number confirmation.
-            throw new ServerException(_('Could not delete SMS confirmation.'));
-        }
+        $confirm->delete();
 
         // TRANS: Message given after successfully canceling SMS phone number confirmation.
         return _('SMS confirmation cancelled.');