diogo/symfony
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed wrong merge

Browse Source
This commit is contained in:
Fabien Potencier 2013-09-29 21:54:28 +02:00
parent d10dec9bf3
commit 59409b47c8
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Symfony/Component/Routing/Router.php
View File

@ -266,13 +266,8 @@ class Router implements RouterInterface
} else {
$class = $this->options['generator_cache_class'];
$cache = new ConfigCache($this->options['cache_dir'].'/'.$class.'.php', $this->options['debug']);
<<<<<<< HEAD
if (!$cache->isFresh($class)) {
$dumper = $this->getGeneratorDumperInstance();
=======
if (!$cache->isFresh()) {
$dumper = new $this->options['generator_dumper_class']($this->getRouteCollection());
>>>>>>> 2.3
$dumper = $this->getGeneratorDumperInstance();
$options = array(
'class' => $class,