diff options
author | Marc Alexander <admin@m-a-styles.de> | 2013-07-04 00:14:48 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2013-07-04 00:14:48 +0200 |
commit | 68f001aaaf761268975d38d7ddcbdf024bb26def (patch) | |
tree | afa75c51f61239f8ed842de8a8487a1b155ca69d /phpBB/includes/functions_user.php | |
parent | 6fc997924c2c9792c8151db67e3273202951de3e (diff) | |
parent | b3487b3167632f47d98eef25692924aa7ab25863 (diff) | |
download | forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.gz forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.bz2 forums-68f001aaaf761268975d38d7ddcbdf024bb26def.tar.xz forums-68f001aaaf761268975d38d7ddcbdf024bb26def.zip |
Merge branch 'develop' of https://github.com/phpbb/phpbb3 into ticket/11600
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r-- | phpBB/includes/functions_user.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php index 7b11e4f01b..1b598f7bf7 100644 --- a/phpBB/includes/functions_user.php +++ b/phpBB/includes/functions_user.php @@ -1653,7 +1653,7 @@ function validate_username($username, $allowed_username = false) */ function validate_password($password) { - global $config, $db, $user; + global $config; if ($password === '' || $config['pass_complex'] === 'PASS_TYPE_ANY') { |