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

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

diff --git a/actions/confirmaddress.php b/actions/confirmaddress.php
index 05ddce75a92e0d7f45663c487aba377970e0fb2c..806851001e3cf45e4a0f13717b9589b8cd89060d 100644 (file)
--- a/actions/confirmaddress.php
+++ b/actions/confirmaddress.php
@@ -108,13 +108,8 @@ class ConfirmaddressAction extends Action
                 $cur->smsemail = $carrier->toEmailAddress($cur->sms);
             }
 
-            $result = $cur->updateKeys($orig_user);
-
-            if (!$result) {
-                common_log_db_error($cur, 'UPDATE', __FILE__);
-                // TRANS: Server error displayed when confirming an e-mail address or IM address fails.
-                $this->serverError(_('Could not update user.'));
-            }
+            // Throws exception on failure.
+            $cur->updateWithKeys($orig_user);
 
             if ($type == 'email') {
                 $cur->emailChanged();