Development

Changeset 6661

You must first sign up to be able to contribute.

Changeset 6661

Show
Ignore:
Timestamp:
12/21/07 08:08:46 (10 months ago)
Author:
fabien
Message:

removed sfConfig dependency for the routing sub-framework

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/1.1/lib/config/sfFactoryConfigHandler.class.php

    r6660 r6661  
    167167 
    168168        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)); 
    170170          if (isset($parameters['load_configuration']) && $parameters['load_configuration']) 
    171171          { 

  • branches/1.1/lib/routing/sfPatternRouting.class.php

    r6126 r6661  
    169169  public function clearRoutes() 
    170170  { 
    171     if (sfConfig::get('sf_logging_enabled')) 
     171    if ($this->parameterHolder->get('logging')) 
    172172    { 
    173173      $this->dispatcher->notify(new sfEvent($this, 'application.log', array('Clear all current routes'))); 
    …… 
    330330    } 
    331331 
    332     if (sfConfig::get('sf_logging_enabled')) 
     332    if ($this->parameterHolder->get('logging')) 
    333333    { 
    334334      $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Connect "%s"%s', $route, $suffix ? ' ("'.$suffix.'" suffix)' : '')))); 
    …… 
    581581          $this->currentInternalUri = null; 
    582582 
    583           if (sfConfig::get('sf_logging_enabled')) 
     583          if ($this->parameterHolder->get('logging')) 
    584584          { 
    585585            $this->dispatcher->notify(new sfEvent($this, 'application.log', array(sprintf('Match route [%s] "%s"', $routeName, $route)))); 
    …… 
    594594    if (!$break) 
    595595    { 
    596       if (sfConfig::get('sf_logging_enabled')) 
     596      if ($this->parameterHolder->get('logging')) 
    597597      { 
    598598        $this->dispatcher->notify(new sfEvent($this, 'application.log', array('No matching route found')));