From 63e23420bb44409193d8c87a4a7c9b194fc4b304 Mon Sep 17 00:00:00 2001 From: Jacson Passold Date: Tue, 29 May 2018 20:32:02 -0300 Subject: [PATCH] check if is a valid key, remove old code --- src/exposers/class-tainacan-exposers.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/exposers/class-tainacan-exposers.php b/src/exposers/class-tainacan-exposers.php index 0dc0ed6fa..7c816182a 100644 --- a/src/exposers/class-tainacan-exposers.php +++ b/src/exposers/class-tainacan-exposers.php @@ -85,12 +85,14 @@ class Exposers { * @return string */ public function check_class_name($class_name, $root = false, $prefix = 'Tainacan\Exposers\Types\\') { - if(array_key_exists($class_name, $this->types)) { - $class_name = $this->types[$class_name]; - $prefix = ''; - } elseif( array_key_exists($class_name, $this->mappers)) { - $class_name = $this->mappers[$class_name]; - $prefix = ''; + if(is_string($class_name)) { + if(array_key_exists($class_name, $this->types)) { + $class_name = $this->types[$class_name]; + $prefix = ''; + } elseif( array_key_exists($class_name, $this->mappers)) { + $class_name = $this->mappers[$class_name]; + $prefix = ''; + } } $class = $prefix.sanitize_text_field($class_name); $class = str_replace(['-', ' '], ['_', '_'], $class); @@ -231,8 +233,6 @@ class Exposers { * @return boolean */ public function has_mapper($mapper) { - if(array_key_exists($mapper, $this->mappers)) return true; - return in_array($this->check_class_name($mapper, false, self::MAPPER_CLASS_PREFIX), $this->mappers); }