Merge pull request #5820 from marc1706/ticket/16293

[ticket/16293] Do not update to hashes that don't support combined hashing
This commit is contained in:
Marc Alexander 2020-01-06 11:20:39 +01:00
commit 17d4dcc30b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995

View file

@ -56,7 +56,7 @@ class update_hashes extends \phpbb\cron\task\base
foreach ($defaults as $type) 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; $this->default_type = $type;
break; break;