Changeset 4894
- Timestamp:
- 08/24/07 15:02:01 (2 years ago)
- Files:
-
- trunk/data/config/factories.yml (modified) (1 diff)
- trunk/lib/config/sfFactoryConfigHandler.class.php (modified) (1 diff)
- trunk/lib/routing/sfPatternRouting.class.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/data/config/factories.yml
r4845 r4894 36 36 routing: 37 37 class: sfPatternRouting 38 param: 39 load_configuration: true 38 40 39 41 logger: trunk/lib/config/sfFactoryConfigHandler.class.php
r4892 r4894 185 185 186 186 // 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)); 188 188 break; 189 189 trunk/lib/routing/sfPatternRouting.class.php
r4892 r4894 44 44 parent::initialize($logger, $parameters); 45 45 46 $this-> defaultSuffix = $this->parameterHolder->get('suffix', '');46 $this->setDefaultSuffix($this->parameterHolder->get('suffix')); 47 47 48 48 if ($this->parameterHolder->get('load_configuration', false))
