Detect app.debug if enabled is null

Fixes barryvdh#285 It cannot be guaranteed that app.debug is loaded before debugbar.
agprasha · Feb 19, 2015 · 7bdf8ac · 7bdf8ac
1 parent 77b9cc0
commit 7bdf8ac
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/config/debugbar.php b/config/debugbar.php
@@ -8,10 +8,11 @@
      |--------------------------------------------------------------------------
      |
      | Debugbar is enabled by default, when debug is set to true in app.php.
+     | You can override the value by setting enable to true or false instead of null.
      |
      */
 
-    'enabled' => config('app.debug'),
+    'enabled' => null,
 
     /*
      |--------------------------------------------------------------------------

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -84,7 +84,15 @@ public function boot()
             ]);
         });
 
-        if (! $this->app['config']->get('debugbar.enabled')) {
+        $enabled = $this->app['config']->get('debugbar.enabled');
+
+        // If enabled is null, set from the app.debug value
+        if (is_null($enabled)) {
+            $enabled = $this->app['config']->get('app.debug');
+            $this->app['config']->set('debugbar.enabled', $enabled);
+        }
+
+        if ( ! $enabled) {
             return;
         }