TheCoreDev/sterivein
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into tax

Browse Source 
Conflicts:
	core/lib/Thelia/Config/Resources/config.xml
	templates/admin/default/configuration.html
This commit is contained in:
Etienne Roudeix
2013-10-21 08:13:18 +02:00
parent 0300470f7d 07a2944618
commit c63c509f2f
93 changed files with 6046 additions and 3974 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
local/modules/TheliaDebugBar/Listeners/DebugBarListeners.php
View File

@@ -45,13 +45,17 @@ class DebugBarListeners extends BaseAction implements EventSubscriberInterface {
{
$debugBar = $this->container->get("debugBar");
$alternativelogger = null;
if($this->container->getParameter('kernel.debug')) {
$alternativelogger = \Thelia\Log\Tlog::getInstance();
}
$debugBar->addCollector(new PhpInfoCollector());
//$debugBar->addCollector(new MessagesCollector());
//$debugBar->addCollector(new RequestDataCollector());
$debugBar->addCollector(new TimeDataCollector());
$debugBar->addCollector(new MemoryCollector());
$debugBar->addCollector(new PropelCollector(\Thelia\Log\Tlog::getInstance()));
$debugBar->addCollector(new PropelCollector($alternativelogger));
}
/**