Our URLs are permanent redirects, mind you!

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index cbe923fc0eddb711a9573e4565c5a904ce61b521..c8b334d489ab76c553f7a27e6601c1cb63c397d3 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -1017,8 +1017,16 @@ class User extends Managed_DataObject
         $orig = clone($this);
         $this->password = common_munge_password($password, $this->getProfile());
 
+        if ($this->validate() !== true) {
+            // TRANS: Form validation error on page where to change password.
+            throw new ServerException(_('Error saving user; invalid.'));
+        }
+
         if (!$this->update($orig)) {
-            throw new ServerException("Error updating user '{$nickname}'.");
+            common_log_db_error($this, 'UPDATE', __FILE__);
+            // TRANS: Server error displayed on page where to change password when password change
+            // TRANS: could not be made because of a server error.
+            throw new ServerException(_('Cannot save new password.'));
         }
     }