Changeset 2968

Timestamp:

09/30/08 17:17:55 (3 months ago)

Author:

david

Message:

FIxed #867: Per-module config_handlers.xml will cause "unsupported operand types" fatal error with debug mode off

Location:

branches/1.0

Files:

• CHANGELOG (modified) (1 diff)
• src/config/AgaviConfigCache.class.php (modified) (1 diff)

branches/1.0/CHANGELOG

@@ -5 +5 @@
 -------------------------------
 
+FIX: Per-module config_handlers.xml will cause "unsupported operand types" fatal error with debug mode off (#867) (David)
 FIX: AgaviXmlConfigDomElement::hasChild() does not pass on $namespaceUri argument (#865) (David)
 

branches/1.0/src/config/AgaviConfigCache.class.php

@@ -349 +349 @@
   
   /**
-   * add the config handlers from the given config file
+   * Add the config handlers from the given config file.
+   * Existing handlers will not be overwritten.
    * 
-   * existing handlers will not be overwritten
-   * 
-   * @param      string the path to the config_handlers.xml
+   * @param      string The path to a config_handlers.xml file.
    * 
    * @author     Felix Gilcher <felix.gilcher@bitextender.com>
    * @since      1.0.0
-   * 
    */
   public static function loadConfigHandlersFile($cfg)
   {
-    self::$handlers += include AgaviConfigCache::checkConfig($cfg);
+    self::$handlers = (array)self::$handlers + include(AgaviConfigCache::checkConfig($cfg));
   }