diff --git a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
index 85634882bd416..f56b1f2f50d1a 100644
--- a/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
+++ b/src/Symfony/Bundle/WebProfilerBundle/Resources/config/profiler.xml
@@ -56,7 +56,20 @@
%debug.file_link_format%
%kernel.project_dir%
- /_profiler/open?file=%%f&line=%%l#line%%l
+
+
+
+
+
+
+
+ _profiler_open_file
+
+
+ ?file=%%f&line=%%l#line%%l
+
+
+
diff --git a/src/Symfony/Component/Routing/Router.php b/src/Symfony/Component/Routing/Router.php
index 0de921853f875..ed56332ecd5f5 100644
--- a/src/Symfony/Component/Routing/Router.php
+++ b/src/Symfony/Component/Routing/Router.php
@@ -302,7 +302,9 @@ function (ConfigCacheInterface $cache) {
}
);
- require_once $cache->getPath();
+ if (!class_exists($this->options['matcher_cache_class'], false)) {
+ require_once $cache->getPath();
+ }
return $this->matcher = new $this->options['matcher_cache_class']($this->context);
}
@@ -334,7 +336,9 @@ function (ConfigCacheInterface $cache) {
}
);
- require_once $cache->getPath();
+ if (!class_exists($this->options['generator_cache_class'], false)) {
+ require_once $cache->getPath();
+ }
$this->generator = new $this->options['generator_cache_class']($this->context, $this->logger);
}