Changeset 2978

Show
Ignore:
Timestamp:
10/06/08 16:27:18 (6 weeks ago)
Author:
david
Message:

Fixed #870: Configuration files with old-style handlers are never validated

Location:
branches/1.0
Files:
3 modified

Legend:

Unmodified
Added
Removed

  • branches/1.0/CHANGELOG

    r2974 r2978  
    55------------------------------- 
    66 
     7FIX: Configuration files with old-style handlers are never validated (#870) (David) 
    78FIX: Per-module config_handlers.xml will cause "unsupported operand types" fatal error with debug mode off (#867) (David) 
    89FIX: AgaviXmlConfigDomElement::hasChild() does not pass on $namespaceUri argument (#865) (David) 

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

    r2968 r2978  
    116116    } else { 
    117117      $validationFile = null; 
    118       if(isset($handlerInfo['validations'][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0])) { 
    119         $validationFile = $handlerInfo['validations'][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0]; 
     118      if(isset($handlerInfo['validations'][AgaviXmlConfigParser::STAGE_SINGLE][AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0])) { 
     119        $validationFile = $handlerInfo['validations'][AgaviXmlConfigParser::STAGE_SINGLE][AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][0]; 
    120120      } 
    121121      $handler->initialize($validationFile, null, $handlerInfo['parameters']); 

  • branches/1.0/src/config/AgaviConfigParser.class.php

    r2648 r2978  
    5959    ); 
    6060    if($validationFile !== null) { 
    61       $validation[AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][] = array($validationFile); 
     61      $validation[AgaviXmlConfigParser::STEP_TRANSFORMATIONS_AFTER][AgaviXmlConfigParser::VALIDATION_TYPE_XMLSCHEMA][] = $validationFile; 
    6262    } 
    6363    $doc = $parser->execute(array(), $validation);