Changeset 2772

Show
Ignore:
Timestamp:
09/03/08 16:07:20 (4 months ago)
Author:
david
Message:

Fixed #839: module.xml must not be per-context

Location:
branches/0.11
Files:
2 modified

Legend:

Unmodified
Added
Removed

  • branches/0.11/CHANGELOG

    r2750 r2772  
    11AGAVI CHANGELOG 
    22=============== 
     3 
     40.11.3 RC2 (September ?, 2008) 
     5------------------------------ 
     6 
     7FIX: module.xml must not be per-context (#839) (David) 
    38 
    490.11.3 RC1 (August 31, 2008) 

  • branches/0.11/src/controller/AgaviExecutionContainer.class.php

    r2564 r2772  
    275275    // loaded only once due to the way load() (former import()) works 
    276276    if(is_readable(AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/module.xml')) { 
    277       AgaviConfigCache::load(AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/module.xml', $this->context->getName()); 
     277      AgaviConfigCache::load(AgaviConfig::get('core.module_dir') . '/' . $moduleName . '/config/module.xml'); 
    278278    } else { 
    279279      AgaviConfig::set('modules.' . strtolower($moduleName) . '.enabled', true);