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/functions.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/functions.php')
-rw-r--r-- | phpBB/includes/functions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions.php b/phpBB/includes/functions.php index 795bfb77bf..2645e55446 100644 --- a/phpBB/includes/functions.php +++ b/phpBB/includes/functions.php @@ -3069,11 +3069,11 @@ function login_box($redirect = '', $l_explain = '', $l_success = '', $admin = fa trigger_error('NO_AUTH_ADMIN'); } - $password = request_var('password_' . $credential, '', true); + $password = $request->untrimmed_variable('password_' . $credential, '', true); } else { - $password = request_var('password', '', true); + $password = $request->untrimmed_variable('password', '', true); } $username = request_var('username', '', true); |