LOG4PHP-118: Additivity cannot be disabled. Thanks for the patch to Craig Marvelley
authorChristian Grobmeier <grobmeier@apache.org>
Tue, 15 Feb 2011 20:15:45 +0000 (20:15 +0000)
committerChristian Grobmeier <grobmeier@apache.org>
Tue, 15 Feb 2011 20:15:45 +0000 (20:15 +0000)
git-svn-id: https://svn.apache.org/repos/asf/logging/log4php/trunk@1071033 13f79535-47bb-0310-9956-ffa450edef68

src/changes/changes.xml
src/main/php/configurators/LoggerConfiguratorIni.php

index 6d715c3..49d56e9 100644 (file)
@@ -24,6 +24,7 @@
   </properties>
   <body>
        <release version="2.1" description="Stabilizing">
+               <action type="fix" issue="LOG4PHP-118" by="Craig Marvelley">Additivity cannot be disabled through log4php.properties ini file.</action>
                <action type="update" issue="LOG4PHP-110" by="Vladimir Gorej, Christian Grobmeier">Added MongoDB appender</action>
                <action type="fix" issue="LOG4PHP-131" by="Ivan Habunek">File appenders parameters (removed overloading of setFile()).</action>
                <action type="fix" issue="LOG4PHP-133" by="Dmitry Katemirov,Ivan Habunek">PDO appender doesn't close connections</action>
index bd630a7..6ab9d85 100644 (file)
@@ -366,12 +366,8 @@ class LoggerConfiguratorIni implements LoggerConfigurator {
         */
        private function parseAdditivityForLogger($props, Logger $cat, $loggerName) {
                $value = LoggerOptionConverter::findAndSubst(self::ADDITIVITY_PREFIX . $loggerName, $props);
-               
-               // touch additivity only if necessary
-               if(!empty($value)) {
-                       $additivity = LoggerOptionConverter::toBoolean($value, true);
-                       $cat->setAdditivity($additivity);
-               }
+               $additivity = LoggerOptionConverter::toBoolean($value, true);
+               $cat->setAdditivity($additivity);
        }
 
        /**