diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-27 23:40:04 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-27 23:40:04 +0100 |
| commit | 91a9d25a38b5768283a961429017178f09812cef (patch) | |
| tree | b1419f535e23cae54634a1e5de16ba63ca364a67 /phpBB | |
| parent | b1d738607563d0bc43bc7e93f81165a3bed6bfa8 (diff) | |
| parent | aa916fc43f256952eafc81379af9e0b292497044 (diff) | |
| download | forums-91a9d25a38b5768283a961429017178f09812cef.tar forums-91a9d25a38b5768283a961429017178f09812cef.tar.gz forums-91a9d25a38b5768283a961429017178f09812cef.tar.bz2 forums-91a9d25a38b5768283a961429017178f09812cef.tar.xz forums-91a9d25a38b5768283a961429017178f09812cef.zip | |
Merge branch 'prep-release-3.1.0' into develop-ascraeus
Diffstat (limited to 'phpBB')
| -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']); |