aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-06 11:18:16 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-06 11:18:16 +0100
commit16dbbdb34cfaaf27d367f77395c72fd5676d9a22 (patch)
treec67b50e40f271b58f98b3993bb3fdf0ae4b02f05
parentMerge pull request #5811 from paul999/ticket/16287 (diff)
downloadphpbb-16dbbdb34cfaaf27d367f77395c72fd5676d9a22.tar.gz
phpbb-16dbbdb34cfaaf27d367f77395c72fd5676d9a22.tar.bz2
phpbb-16dbbdb34cfaaf27d367f77395c72fd5676d9a22.zip
[ticket/16293] Do not update to hashes that don't support combined hashing
PHPBB3-16293
-rw-r--r--phpBB/phpbb/cron/task/core/update_hashes.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/cron/task/core/update_hashes.php b/phpBB/phpbb/cron/task/core/update_hashes.php
index ba095abc8b..9e938f74dd 100644
--- a/phpBB/phpbb/cron/task/core/update_hashes.php
+++ b/phpBB/phpbb/cron/task/core/update_hashes.php
@@ -56,7 +56,7 @@ class update_hashes extends \phpbb\cron\task\base
foreach ($defaults as $type)
{
- if ($hashing_algorithms[$type]->is_supported())
+ if ($hashing_algorithms[$type]->is_supported() && !$hashing_algorithms[$type] instanceof \phpbb\passwords\driver\base_native)
{
$this->default_type = $type;
break;