DebugPlugin: bugfix registering panel if global.debug and plugin.debu…

…g are true/false
contributte · Jul 4, 2018 · 90ac9fa · 90ac9fa
1 parent f6085ac
commit 90ac9fa
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/DI/DebugPlugin.php b/src/DI/DebugPlugin.php
@@ -44,9 +44,10 @@ public function __construct(PluginCompiler $compiler)
 	public function loadPluginConfiguration()
 	{
 		$builder = $this->getContainerBuilder();
-		$config = $this->compiler->getExtension()->getConfig();
+		$global = $this->compiler->getExtension()->getConfig();
+		$config = $this->getConfig();
 
-		if ($config['debug'] !== TRUE) return;
+		if ($global['debug'] !== TRUE && $config['debug'] !== TRUE) return;
 
 		$builder->addDefinition($this->prefix('panel'))
 			->setClass(ApiPanel::class);
@@ -94,7 +95,7 @@ public function afterPluginCompile(ClassType $class)
 		$initialize->addBody('?::register($this->getService(?));', [ContainerBuilder::literal(ApiBlueScreen::class), 'tracy.blueScreen']);
 		$initialize->addBody('?::register($this->getService(?));', [ContainerBuilder::literal(ValidationBlueScreen::class), 'tracy.blueScreen']);
 
-		if ($global['debug'] === TRUE || $config['debug'] === TRUE) {
+		if ($global['debug'] === TRUE && $config['debug'] === TRUE) {
 			$initialize->addBody('$this->getService(?)->addPanel($this->getByType(?));', ['tracy.bar', ApiPanel::class]);
 		}
 	}