Skip to content

GitLab

D
drupal
Commit 2a744f89 authored by Dries's avatar Dries
Browse files
Options

- Patch #11791 by kps: trim passwords to avoid copy-paste mistakes.

parent fafa11af
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
modules/user.module
View file @ 2a744f89
......@@ -805,7 +805,7 @@ function user_login($edit = array(), $msg = '') {
else if ($edit['name'] && $edit['pass']) {
if (!$user->uid) {
$user = user_authenticate($edit['name'], $edit['pass']);
$user = user_authenticate($edit['name'], trim($edit['pass']));
}
if ($user->uid) {
......@@ -1158,6 +1158,8 @@ function user_edit_validate($uid, &$edit) {
// If required, check that proposed passwords match. If so, add the new password to $edit.
if ($edit['pass1']) {
$edit['pass1'] = trim($edit['pass1']);
$edit['pass2'] = trim($edit['pass2']);
if ($edit['pass1'] == $edit['pass2']) {
$edit['pass'] = $edit['pass1'];
}
......
modules/user/user.module
View file @ 2a744f89
......@@ -805,7 +805,7 @@ function user_login($edit = array(), $msg = '') {
else if ($edit['name'] && $edit['pass']) {
if (!$user->uid) {
$user = user_authenticate($edit['name'], $edit['pass']);
$user = user_authenticate($edit['name'], trim($edit['pass']));
}
if ($user->uid) {
......@@ -1158,6 +1158,8 @@ function user_edit_validate($uid, &$edit) {
// If required, check that proposed passwords match. If so, add the new password to $edit.
if ($edit['pass1']) {
$edit['pass1'] = trim($edit['pass1']);
$edit['pass2'] = trim($edit['pass2']);
if ($edit['pass1'] == $edit['pass2']) {
$edit['pass'] = $edit['pass1'];
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment