From 8f863d1d498fb4e3855ca2a3a1b4094d08d876b1 Mon Sep 17 00:00:00 2001 From: Marc Alexander Date: Fri, 5 Jul 2013 23:56:57 +0200 Subject: [PATCH] [feature/passwords] Do not check if type_map is empty If the type map is empty the service container is incomplete or broken. There is no need to check this as other components would probably be broken at the same time. PHPBB3-11610 --- phpBB/includes/crypto/manager.php | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/phpBB/includes/crypto/manager.php b/phpBB/includes/crypto/manager.php index b57c6ce9a0..26b80087b8 100644 --- a/phpBB/includes/crypto/manager.php +++ b/phpBB/includes/crypto/manager.php @@ -75,11 +75,6 @@ class phpbb_crypto_manager */ protected function fill_type_map($hashing_algorithms) { - if ($this->type_map !== false) - { - return; - } - foreach ($hashing_algorithms as $algorithm) { if (!isset($this->type_map[$algorithm->get_prefix()])) @@ -187,12 +182,6 @@ class phpbb_crypto_manager public function check_hash($password, $hash) { - if (!$this->type_map) - { - // This obviously shouldn't happen - return false; - } - // First find out what kind of hash we're dealing with $stored_hash_type = $this->get_hashing_algorithm($hash); if ($stored_hash_type == false)