diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 18:34:36 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 18:34:36 +0200 |
| commit | 30801e1f0a9aab6a3b4e589be1e43309543e8293 (patch) | |
| tree | c989a0ae2501430240bf1025223aa31ff97e2b50 /phpBB/includes | |
| parent | 949a443bfe6f75e0cb3d944d05b25797c8a63697 (diff) | |
| parent | c6ba894acdfdf5b0800dc3903d01605ddd83e8e9 (diff) | |
| download | forums-30801e1f0a9aab6a3b4e589be1e43309543e8293.tar forums-30801e1f0a9aab6a3b4e589be1e43309543e8293.tar.gz forums-30801e1f0a9aab6a3b4e589be1e43309543e8293.tar.bz2 forums-30801e1f0a9aab6a3b4e589be1e43309543e8293.tar.xz forums-30801e1f0a9aab6a3b4e589be1e43309543e8293.zip | |
Merge remote-tracking branch 'marc1706/ticket/11579' into develop-olympus
* marc1706/ticket/11579:
[ticket/11579] Add method for validating emails for valid MX and mark as slow
[ticket/11579] Do not extend validate_data_helper
[ticket/11579] Add missing commas to validate_username_test
[ticket/11579] Rework calls to validate_data_helper
[ticket/11579] Move simple tests into seperate files
[ticket/11579] Use test case helper class and use assert prefix for method
[ticket/11579] Move tests into seperate files depending on needed fixture
[ticket/11579] Remove unnecessary globals from validate_password()
[ticket/11579] Add remaining unit tests for validate_data functions
[ticket/11579] Add basic set of unit tests for validate_data()
Diffstat (limited to 'phpBB/includes')
| -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 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') { |