diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 18:46:30 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2013-06-11 18:46:30 +0200 |
| commit | b4183eda0caae2dfbe1425db27f3618c98db8504 (patch) | |
| tree | 06e737e8494ca08e286f842c42780cde52466cc1 /phpBB/includes/functions_user.php | |
| parent | 97c29c38760ccb3b121ca486bcd85ef683352f37 (diff) | |
| parent | 30801e1f0a9aab6a3b4e589be1e43309543e8293 (diff) | |
| download | forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar.gz forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar.bz2 forums-b4183eda0caae2dfbe1425db27f3618c98db8504.tar.xz forums-b4183eda0caae2dfbe1425db27f3618c98db8504.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[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()
Conflicts:
tests/mock/cache.php
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') { |