Cosmetic changes to common_redirect, clientError, serverError

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

diff --git a/actions/passwordsettings.php b/actions/passwordsettings.php
index 465cb558a4bcdaffb71af5165609d93ccf0b71f7..db36b612a29becfa806733c885e57ff955504f48 100644 (file)
--- a/actions/passwordsettings.php
+++ b/actions/passwordsettings.php
@@ -143,6 +143,7 @@ class PasswordsettingsAction extends SettingsAction
 
         $token = $this->trimmed('token');
         if (!$token || $token != common_session_token()) {
+            // TRANS: Client error displayed when the session token does not match or is not given.
             $this->showForm(_('There was a problem with your session token. '.
                                'Try again, please.'));
             return;
@@ -156,7 +157,7 @@ class PasswordsettingsAction extends SettingsAction
         $newpassword = $this->arg('newpassword');
         $confirm     = $this->arg('confirm');
 
-        # Some validation
+        // Some validation
 
         if (strlen($newpassword) < 6) {
             // TRANS: Form validation error on page where to change password.
@@ -195,10 +196,9 @@ class PasswordsettingsAction extends SettingsAction
             }
 
             if (!$user->update($original)) {
-            // TRANS: Server error displayed on page where to change password when password change
-            // TRANS: could not be made because of a server error.
-            $this->serverError(_('Cannot save new password.'));
-                return;
+                // TRANS: Server error displayed on page where to change password when password change
+                // TRANS: could not be made because of a server error.
+                $this->serverError(_('Cannot save new password.'));
             }
             Event::handle('EndChangePassword', array($user));
         }