X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=actions%2Fpassword.php;h=8f770a969d57c75ff4220724dd63e6dfaa4c49c6;hb=d1fc067471a72589c9ae655f67eeea1709e12af5;hp=63b99c6239aaf08705b3794972adaa0f76575bf1;hpb=3a2d17f9f64ef7b48f2c32e144c1eb5e000f7313;p=quix0rs-gnu-social.git

diff --git a/actions/password.php b/actions/password.php
index 63b99c6239..8f770a969d 100644
--- a/actions/password.php
+++ b/actions/password.php
@@ -34,15 +34,9 @@ class PasswordAction extends SettingsAction {
 		common_password('oldpassword', _t('Old password'));
 		common_password('newpassword', _t('New password'));
 		common_password('confirm', _t('Confirm'));
-		common_element('input', array('name' => 'submit',
-									  'type' => 'submit',
-									  'id' => 'submit'),
-					   _t('Login'));
-		common_element('input', array('name' => 'cancel',
-									  'type' => 'button',
-									  'id' => 'cancel'),
-					   _t('Cancel'));
+		common_submit('submit', _t('Change'));
 		common_element_end('form');
+		common_show_footer();
 	}
 
 	function handle_post() {
@@ -70,6 +64,12 @@ class PasswordAction extends SettingsAction {
 
 		$user->password = common_munge_password($newpassword, $user->id);
 
+		$val = $user->validate();
+		if ($val !== TRUE) {
+			$this->show_form(_t('Error saving user; invalid.'));
+			return;
+		}
+
 		if (!$user->update($original)) {
 			common_server_error(_t('Can\'t save new password.'));
 			return;