diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-27 23:40:19 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-27 23:40:19 +0100 |
| commit | 120bdf9364bcfecac1d859cfad01e9042ac4a8b4 (patch) | |
| tree | 865a1cb40023f288f9146e600654f00353d29f31 | |
| parent | d74bf0f37075dfadf09340b4174c364d208617f6 (diff) | |
| parent | 91a9d25a38b5768283a961429017178f09812cef (diff) | |
| download | forums-120bdf9364bcfecac1d859cfad01e9042ac4a8b4.tar forums-120bdf9364bcfecac1d859cfad01e9042ac4a8b4.tar.gz forums-120bdf9364bcfecac1d859cfad01e9042ac4a8b4.tar.bz2 forums-120bdf9364bcfecac1d859cfad01e9042ac4a8b4.tar.xz forums-120bdf9364bcfecac1d859cfad01e9042ac4a8b4.zip | |
Merge branch 'develop-ascraeus' into develop
| -rw-r--r-- | phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php index f593c32181..2cc7786046 100644 --- a/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php +++ b/phpBB/phpbb/db/migration/data/v30x/release_3_0_5_rc1.php @@ -55,6 +55,9 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration public function hash_old_passwords() { + global $phpbb_container; + + $passwords_manager = $phpbb_container->get('passwords.manager'); $sql = 'SELECT user_id, user_password FROM ' . $this->table_prefix . 'users WHERE user_pass_convert = 1'; @@ -65,7 +68,7 @@ class release_3_0_5_rc1 extends \phpbb\db\migration\migration if (strlen($row['user_password']) == 32) { $sql_ary = array( - 'user_password' => phpbb_hash($row['user_password']), + 'user_password' => '$CP$' . $passwords_manager->hash($row['user_password'], 'passwords.driver.salted_md5'), ); $this->sql_query('UPDATE ' . $this->table_prefix . 'users SET ' . $this->db->sql_build_array('UPDATE', $sql_ary) . ' WHERE user_id = ' . $row['user_id']); |