aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_user.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-07-11 17:30:32 -0400
committerMarc Alexander <admin@m-a-styles.de>2013-07-11 17:30:32 -0400
commitdc4687501a16b2c50a9ebfcb9f941a02d9572764 (patch)
tree58277fdfd34f4ee4381e8b6827efdd0ab58f0def /phpBB/includes/functions_user.php
parent599f83395f90c9a899b0e639ba5acacfb8ae372b (diff)
parent94e5bfaadad3be2bcda5347754c3f1b5be33c620 (diff)
downloadforums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar.gz
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar.bz2
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.tar.xz
forums-dc4687501a16b2c50a9ebfcb9f941a02d9572764.zip
Merge branch 'develop-olympus' of https://github.com/phpbb/phpbb3 into ticket/11548
Diffstat (limited to 'phpBB/includes/functions_user.php')
-rw-r--r--phpBB/includes/functions_user.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/functions_user.php b/phpBB/includes/functions_user.php
index 2b26c6787c..ea8b0a4640 100644
--- a/phpBB/includes/functions_user.php
+++ b/phpBB/includes/functions_user.php
@@ -1554,7 +1554,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')
{