aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2020-01-06 11:20:39 +0100
committerMarc Alexander <admin@m-a-styles.de>2020-01-06 11:20:39 +0100
commit17d4dcc30b286d40147bd80b6517a5ad0c4e3966 (patch)
tree34601245499d1318011fb320f7f4de7ebdde3cef /phpBB
parent433a23feb4244e24653e3b3d27ae3b5161e4aa8a (diff)
parent16dbbdb34cfaaf27d367f77395c72fd5676d9a22 (diff)
downloadforums-17d4dcc30b286d40147bd80b6517a5ad0c4e3966.tar
forums-17d4dcc30b286d40147bd80b6517a5ad0c4e3966.tar.gz
forums-17d4dcc30b286d40147bd80b6517a5ad0c4e3966.tar.bz2
forums-17d4dcc30b286d40147bd80b6517a5ad0c4e3966.tar.xz
forums-17d4dcc30b286d40147bd80b6517a5ad0c4e3966.zip
Merge pull request #5820 from marc1706/ticket/16293
[ticket/16293] Do not update to hashes that don't support combined hashing
Diffstat (limited to 'phpBB')
-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;