diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2013-07-05 23:56:57 +0200 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2013-09-14 13:54:39 +0200 |
| commit | 8f863d1d498fb4e3855ca2a3a1b4094d08d876b1 (patch) | |
| tree | 7c3777930bd084dfa98c715f13d47e43bfdf630a | |
| parent | fcb71308232f8cd121096fe627e020463cd67593 (diff) | |
| download | forums-8f863d1d498fb4e3855ca2a3a1b4094d08d876b1.tar forums-8f863d1d498fb4e3855ca2a3a1b4094d08d876b1.tar.gz forums-8f863d1d498fb4e3855ca2a3a1b4094d08d876b1.tar.bz2 forums-8f863d1d498fb4e3855ca2a3a1b4094d08d876b1.tar.xz forums-8f863d1d498fb4e3855ca2a3a1b4094d08d876b1.zip | |
[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
| -rw-r--r-- | phpBB/includes/crypto/manager.php | 11 |
1 files changed, 0 insertions, 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) |