Changeset 6661
- Timestamp:
- 12/21/07 08:08:46 (2 years ago)
- Files:
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/1.1/lib/config/sfFactoryConfigHandler.class.php
r6660 r6661 167 167 168 168 case 'routing': 169 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_routing', '%s');\n \$this->factories['routing'] = new \$class(\$this->dispatcher, array_merge(array('auto_shutdown' => false, '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)));", $class, var_export(is_array($parameters) ? $parameters : array(), true));169 $instances[] = sprintf(" \$class = sfConfig::get('sf_factory_routing', '%s');\n \$this->factories['routing'] = new \$class(\$this->dispatcher, array_merge(array('auto_shutdown' => false, 'suffix' => sfConfig::get('sf_suffix'), 'default_module' => sfConfig::get('sf_default_module'), 'default_action' => sfConfig::get('sf_default_action'), 'logging' => sfConfig::get('sf_logging_enabled')), sfConfig::get('sf_factory_routing_parameters', %s)));", $class, var_export(is_array($parameters) ? $parameters : array(), true)); 170 170 if (isset($parameters['load_configuration']) && $parameters['load_configuration']) 171 171 { branches/1.1/lib/routing/sfPatternRouting.class.php
r6126 r6661 169 169 public function clearRoutes() 170 170 { 171 if ( sfConfig::get('sf_logging_enabled'))171 if ($this->parameterHolder->get('logging')) 172 172 { 173 173 $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Clear all current routes'))); … … 330 330 } 331 331 332 if ( sfConfig::get('sf_logging_enabled'))332 if ($this->parameterHolder->get('logging')) 333 333 { 334 334 $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Connect "%s"%s', $route, $suffix ? ' ("'.$suffix.'" suffix)' : '')))); … … 581 581 $this->currentInternalUri = null; 582 582 583 if ( sfConfig::get('sf_logging_enabled'))583 if ($this->parameterHolder->get('logging')) 584 584 { 585 585 $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Match route [%s] "%s"', $routeName, $route)))); … … 594 594 if (!$break) 595 595 { 596 if ( sfConfig::get('sf_logging_enabled'))596 if ($this->parameterHolder->get('logging')) 597 597 { 598 598 $this->dispatcher->notify(new sfEvent($this, 'application.log', array('No matching route found')));
