diff options
| author | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-12 17:09:12 -0500 |
|---|---|---|
| committer | Nathan Guse <nathaniel.guse@gmail.com> | 2012-10-12 17:09:12 -0500 |
| commit | 94a3dc5ff7292c8271dfcff9408aa89d401b72ac (patch) | |
| tree | 6c7bd95bc177a40ee8f7e81fc3f2333c53363a8d /phpBB/includes/auth/auth_db.php | |
| parent | 3d79ce28031b4c85ee34bd4d43f0c64b18b1a80b (diff) | |
| parent | f1a692a5f45d993fe2578f13d365ca10543696f8 (diff) | |
| download | forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.gz forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.bz2 forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.tar.xz forums-94a3dc5ff7292c8271dfcff9408aa89d401b72ac.zip | |
Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103
Diffstat (limited to 'phpBB/includes/auth/auth_db.php')
| -rw-r--r-- | phpBB/includes/auth/auth_db.php | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php index 76790e4dad..ac944532a5 100644 --- a/phpBB/includes/auth/auth_db.php +++ b/phpBB/includes/auth/auth_db.php @@ -41,6 +41,10 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for global $db, $config; global $request; + // Auth plugins get the password untrimmed. + // For compatibility we trim() here. + $password = trim($password); + // do not allow empty password if (!$password) { |