mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-06 16:56:44 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop' of git://github.com/phpbb/phpbb3 into ticket/11103

Browse Source
This commit is contained in:
Nathan Guse
2012-10-12 17:09:12 -05:00
parent 3d79ce2803 f1a692a5f4
commit 94a3dc5ff7
17 changed files with 329 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/functions.php
View File

@@ -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);