diff options
| author | Nils Adermann <naderman@naderman.de> | 2014-02-02 06:26:35 -0800 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2014-02-02 06:26:35 -0800 |
| commit | f8d6a07392f73bc7b85418a60047d761661a7657 (patch) | |
| tree | cfefda4a9dab1019c9e6fad96c8055cec5b03c9e /phpBB/includes/acp/acp_forums.php | |
| parent | cb04252fbd17ac718c09ecc44dab4c7627a98b35 (diff) | |
| parent | b094c7999660703370566018bf449a9280148b8d (diff) | |
| download | forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.gz forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.bz2 forums-f8d6a07392f73bc7b85418a60047d761661a7657.tar.xz forums-f8d6a07392f73bc7b85418a60047d761661a7657.zip | |
Merge pull request #1716 from marc1706/feature/passwords
[feature/passwords] Add password hashing manager with support for newer hashing algorithms
Diffstat (limited to 'phpBB/includes/acp/acp_forums.php')
| -rw-r--r-- | phpBB/includes/acp/acp_forums.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/acp/acp_forums.php b/phpBB/includes/acp/acp_forums.php index 029f4b23c9..a1af8c489d 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']); |