aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp/acp_forums.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-10-13 16:32:37 +0200
committerMarc Alexander <admin@m-a-styles.de>2013-10-13 16:32:37 +0200
commit61f60d395a5f16105a18790f2f73eddcd830e475 (patch)
treea0a39ca19423eeae3ed6d4fe15e9f5023946685f /phpBB/includes/acp/acp_forums.php
parente674313559c0aa4705923fd79312ef14117abb9b (diff)
downloadforums-61f60d395a5f16105a18790f2f73eddcd830e475.tar
forums-61f60d395a5f16105a18790f2f73eddcd830e475.tar.gz
forums-61f60d395a5f16105a18790f2f73eddcd830e475.tar.bz2
forums-61f60d395a5f16105a18790f2f73eddcd830e475.tar.xz
forums-61f60d395a5f16105a18790f2f73eddcd830e475.zip
[feature/passwords] Use passwords manager service instead of functions
The old functions phpbb_hash() and phpbb_check_hash() have been replaced with the passwords manager service in all front-end related files. The phpBB2 converter and the release_3_0_5_rc1 migration file have not been changed. The same applies to the security/hash_test that still tests the function phpbb_check_hash(). This will however make sure that the old function still works. PHPBB3-11610
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
-rw-r--r--phpBB/includes/acp/acp_forums.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php
index 258aabcc0d..6a86e5683d 100644
--- a/phpBB/includes/acp/acp_forums.php
+++ b/phpBB/includes/acp/acp_forums.php
@@ -926,7 +926,7 @@ class acp_forums
*/
function update_forum_data(&$forum_data)
{
- global $db, $user, $cache, $phpbb_root_path, $phpbb_dispatcher;
+ global $db, $user, $cache, $phpbb_root_path, $phpbb_container, $phpbb_dispatcher;
$errors = array();
@@ -1030,7 +1030,10 @@ class acp_forums
}
else
{
- $forum_data_sql['forum_password'] = phpbb_hash($forum_data_sql['forum_password']);
+ // Instantiate passwords manager
+ $passwords_manager = $phpbb_container->get('passwords.manager');
+
+ $forum_data_sql['forum_password'] = $passwords_manager->hash($forum_data_sql['forum_password']);
}
unset($forum_data_sql['forum_password_unset']);