aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorAndreas Fischer <bantu@phpbb.com>2012-03-29 00:51:12 +0200
committerAndreas Fischer <bantu@phpbb.com>2012-03-29 00:51:12 +0200
commit2516b1e8f1ea2c9dd602c51fead6a258de7f5401 (patch)
tree55597ce791f658ca86a8efa4c3e22fb1baad756a /phpBB/includes
parenta820ff1ebcc91f7caece6cd64b58cec1fc6d891e (diff)
parent70d88965c795a5e392605fe556df580773a505c3 (diff)
downloadforums-2516b1e8f1ea2c9dd602c51fead6a258de7f5401.tar
forums-2516b1e8f1ea2c9dd602c51fead6a258de7f5401.tar.gz
forums-2516b1e8f1ea2c9dd602c51fead6a258de7f5401.tar.bz2
forums-2516b1e8f1ea2c9dd602c51fead6a258de7f5401.tar.xz
forums-2516b1e8f1ea2c9dd602c51fead6a258de7f5401.zip
Merge remote-tracking branch 'Dickyf/ticket/10708' into develop-olympus
* Dickyf/ticket/10708: [ticket/10708] Check converted passwords for multi-byte characters
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/auth/auth_db.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/auth/auth_db.php b/phpBB/includes/auth/auth_db.php
index c20196d019..1c6cdf7832 100644
--- a/phpBB/includes/auth/auth_db.php
+++ b/phpBB/includes/auth/auth_db.php
@@ -163,7 +163,7 @@ function login_db($username, $password, $ip = '', $browser = '', $forwarded_for
$password_old_format = (!STRIP) ? addslashes($password_old_format) : $password_old_format;
$password_new_format = '';
- set_var($password_new_format, stripslashes($password_old_format), 'string');
+ set_var($password_new_format, stripslashes($password_old_format), 'string', true);
if ($password == $password_new_format)
{