diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-06-13 22:05:01 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-06-13 22:05:01 +0530 |
| commit | 773bcc1c9bdf68925587c2ca6634938f29210365 (patch) | |
| tree | eb2952fd9c75bf3902ff521adf475b2c01276ab4 /phpBB | |
| parent | e8b535bf9beda58ea8f75071ed31934534849cb1 (diff) | |
| parent | b4183eda0caae2dfbe1425db27f3618c98db8504 (diff) | |
| download | forums-773bcc1c9bdf68925587c2ca6634938f29210365.tar forums-773bcc1c9bdf68925587c2ca6634938f29210365.tar.gz forums-773bcc1c9bdf68925587c2ca6634938f29210365.tar.bz2 forums-773bcc1c9bdf68925587c2ca6634938f29210365.tar.xz forums-773bcc1c9bdf68925587c2ca6634938f29210365.zip | |
Merge branch 'develop' into ticket/10820-develop
# By Marc Alexander (10) and Joas Schilling (2)
# Via Andreas Fischer (3) and Joas Schilling (1)
* develop:
[ticket/11605] Remove unused copied_files property
[ticket/11605] Use empty_dir to better delete files and dirs of extensions
[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')
| -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') { |