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

[WebProfilerBundle] fixed data collector loading (they should always be loaded as you can enable the web profiler without the web debug toolbar)

Browse Source
This commit is contained in:
Fabien Potencier 2010-11-21 15:51:50 +01:00
parent 97d4dce614
commit 381347bcfe
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Symfony/Bundle/WebProfilerBundle/DependencyInjection/WebProfilerExtension.php
View File

@ -42,12 +42,15 @@ class WebProfilerExtension extends Extension
{
$loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
if (!$container->hasParameter('data_collector.templates')) {
$loader->load('web_profiler.xml');
}
if (isset($config['toolbar'])) {
if ($config['toolbar']) {
if (!$container->hasDefinition('debug.toolbar')) {
$loader = new XmlFileLoader($container, __DIR__.'/../Resources/config');
$loader->load('toolbar.xml');
$loader->load('web_profiler.xml');
}
} elseif ($container->hasDefinition('debug.toolbar')) {
$container->getDefinition('debug.toolbar')->clearTags();
@ -60,9 +63,8 @@ class WebProfilerExtension extends Extension
}
}
if (isset($config['templates']) && $container->hasParameter('data_collector.templates')) {
$templates = array_merge($container->getParameter('data_collector.templates'), $config['templates']);
$container->setParameter('data_collector.templates', $templates);
if (isset($config['templates'])) {
$container->setParameter('data_collector.templates', array_merge($container->getParameter('data_collector.templates'), $config['templates']));
}
}