From 8d1dc530cd6ed1f266c7ea9c78cf9fcd5e9bc9af Mon Sep 17 00:00:00 2001 From: Chuck Hagenbuch Date: Fri, 25 Sep 2009 13:12:07 -0400 Subject: [PATCH] tweak hasLevel() and use it in addLevel() --- framework/Log/lib/Horde/Log/Logger.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/framework/Log/lib/Horde/Log/Logger.php b/framework/Log/lib/Horde/Log/Logger.php index eb3fb98b5..37fc2abf7 100644 --- a/framework/Log/lib/Horde/Log/Logger.php +++ b/framework/Log/lib/Horde/Log/Logger.php @@ -147,7 +147,7 @@ class Horde_Log_Logger */ public function hasLevel($name) { - return array_search($name, $this->_levels); + return (boolean)array_search($name, $this->_levels); } /** @@ -162,8 +162,7 @@ class Horde_Log_Logger // Log level names must be uppercase for predictability. $name = strtoupper($name); - if (isset($this->_levels[$level]) - || array_search($name, $this->_levels)) { + if (isset($this->_levels[$level]) || $this->hasLevel($name)) { throw new Horde_Log_Exception('Existing log levels cannot be overwritten'); } -- 2.11.0