diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2014-09-14 20:45:11 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2014-09-14 20:45:11 +0200 |
| commit | 2634db6031944de5c2ef6ea65b7c0cd7dfaca539 (patch) | |
| tree | 283d363b56ae730b50e5b0edbc785b7f6f8dfcad /phpBB | |
| parent | 4250c75de1a780d06b35aed59009f930aaaea779 (diff) | |
| parent | 1487e6f857e1ebdf7d1f4b2af31400aef4bca431 (diff) | |
| download | forums-2634db6031944de5c2ef6ea65b7c0cd7dfaca539.tar forums-2634db6031944de5c2ef6ea65b7c0cd7dfaca539.tar.gz forums-2634db6031944de5c2ef6ea65b7c0cd7dfaca539.tar.bz2 forums-2634db6031944de5c2ef6ea65b7c0cd7dfaca539.tar.xz forums-2634db6031944de5c2ef6ea65b7c0cd7dfaca539.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/install/convertors/convert_phpbb20.php | 3 | ||||
| -rw-r--r-- | phpBB/install/convertors/functions_phpbb20.php | 10 |
2 files changed, 11 insertions, 2 deletions
diff --git a/phpBB/install/convertors/convert_phpbb20.php b/phpBB/install/convertors/convert_phpbb20.php index de0cccd234..d09f71ae22 100644 --- a/phpBB/install/convertors/convert_phpbb20.php +++ b/phpBB/install/convertors/convert_phpbb20.php @@ -896,8 +896,7 @@ if (!$get_info) array('user_regdate', 'users.user_regdate', ''), array('username', 'users.username', 'phpbb_set_default_encoding'), // recode to utf8 with default lang array('username_clean', 'users.username', array('function1' => 'phpbb_set_default_encoding', 'function2' => 'utf8_clean_string')), - array('user_password', 'users.user_password', 'phpbb_hash'), - array('user_pass_convert', 1, ''), + array('user_password', 'users.user_password', 'phpbb_convert_password_hash'), array('user_posts', 'users.user_posts', 'intval'), array('user_email', 'users.user_email', 'strtolower'), array('user_email_hash', 'users.user_email', 'gen_email_hash'), diff --git a/phpBB/install/convertors/functions_phpbb20.php b/phpBB/install/convertors/functions_phpbb20.php index 01447a6232..817c007274 100644 --- a/phpBB/install/convertors/functions_phpbb20.php +++ b/phpBB/install/convertors/functions_phpbb20.php @@ -1969,3 +1969,13 @@ function phpbb_add_notification_options($user_notify_pm) $sql = $db->sql_multi_insert(USER_NOTIFICATIONS_TABLE, $rows); } + +function phpbb_convert_password_hash($hash) +{ + global $phpbb_container; + + $manager = $phpbb_container->get('passwords.manager'); + $hash = $manager->hash($hash, '$H$'); + + return '$CP$' . $hash; +} |