Show
Ignore:
Timestamp:
10/01/08 09:48:27 (3 months ago)
Author:
felix
Message:

Merged revisions 2967-2968 via svnmerge from
http://svn.agavi.org/branches/1.0

........

r2967 | david | 2008-09-30 18:25:21 +0200 (Tue, 30 Sep 2008) | 1 line


merge [2947:2966/branches/0.11]

........

r2968 | david | 2008-09-30 19:17:55 +0200 (Tue, 30 Sep 2008) | 1 line


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

........

Location:
branches/felix-testing-implementation
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/felix-testing-implementation

    • Property svnmerge-integrated changed from /branches/1.0:1-2892,2894-2964 /branches/dominik-validation-argument-sources:1-2901 to /branches/1.0:1-2892,2894-2968 /branches/dominik-validation-argument-sources:1-2901

  • branches/felix-testing-implementation/src/config/AgaviConfigCache.class.php

    r2887 r2969  
    349349   
    350350  /** 
    351    * add the config handlers from the given config file 
     351   * Add the config handlers from the given config file. 
     352   * Existing handlers will not be overwritten. 
    352353   *  
    353    * existing handlers will not be overwritten 
    354    *  
    355    * @param      string the path to the config_handlers.xml 
     354   * @param      string The path to a config_handlers.xml file. 
    356355   *  
    357356   * @author     Felix Gilcher <felix.gilcher@bitextender.com> 
    358357   * @since      1.0.0 
    359    *  
    360358   */ 
    361359  public static function loadConfigHandlersFile($cfg) 
    362360  { 
    363     self::$handlers += include AgaviConfigCache::checkConfig($cfg); 
     361    self::$handlers = (array)self::$handlers + include(AgaviConfigCache::checkConfig($cfg)); 
    364362  } 
    365363