Development

Changeset 4894

You must first sign up to be able to contribute.

Changeset 4894

Show
Ignore:
Timestamp:
08/24/07 15:02:01 (1 year ago)
Author:
fabien
Message:

fixed routing default suffix + moved load_configuration parameter to factories.yml

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/data/config/factories.yml

    r4845 r4894  
    3636  routing: 
    3737    class: sfPatternRouting 
     38    param: 
     39      load_configuration: true 
    3840 
    3941  logger: 

  • trunk/lib/config/sfFactoryConfigHandler.class.php

    r4892 r4894  
    185185 
    186186          // append instance initialization 
    187           $inits[] = sprintf("  \$this->factories['routing']->initialize(\$this->factories['logger'], array_merge(array('load_configuration' => true, 'suffix' => sfConfig::get('sf_suffix'), 'default_module' => sfConfig::get('sf_default_module'), 'default_action' => sfConfig::get('sf_default_action')), sfConfig::get('sf_factory_routing_parameters', %s)));", var_export(is_array($parameters) ? $parameters : array(), true)); 
     187          $inits[] = sprintf("  \$this->factories['routing']->initialize(\$this->factories['logger'], array_merge(array('suffix' => sfConfig::get('sf_suffix'), 'default_module' => sfConfig::get('sf_default_module'), 'default_action' => sfConfig::get('sf_default_action')), sfConfig::get('sf_factory_routing_parameters', %s)));", var_export(is_array($parameters) ? $parameters : array(), true)); 
    188188          break; 
    189189 

  • trunk/lib/routing/sfPatternRouting.class.php

    r4892 r4894  
    4444    parent::initialize($logger, $parameters); 
    4545 
    46     $this->defaultSuffix = $this->parameterHolder->get('suffix', ''); 
     46    $this->setDefaultSuffix($this->parameterHolder->get('suffix')); 
    4747 
    4848    if ($this->parameterHolder->get('load_configuration', false))