Revert commit 581bbff

barryvdh · barryvdh · commit c09d60da988c · 2014-02-19T21:31:01.000+01:00
Causes problems? Just go back until more info. Fixes barryvdh#103 and barryvdh#104
diff --git a/src/Barryvdh/Debugbar/LaravelDebugBar.php b/src/Barryvdh/Debugbar/LaravelDebugBar.php
@@ -161,25 +161,21 @@ public function boot(){
             $this->addCollector(new MessagesCollector('events'));
             $dispatcher = $this->app['events'];
             $dispatcher->listen('*', function() use($debugbar, $dispatcher){
-                    if($debugbar->isEnabled()){
-                        if(method_exists($dispatcher, 'firing')){
-                            $event = $dispatcher->firing();
-                        }else{
-                            $args = func_get_args();
-                            $event = end($args);
-                        }
-                        $debugbar['events']->info("Received event: ". $event);
+                    if(method_exists($dispatcher, 'firing')){
+                        $event = $dispatcher->firing();
+                    }else{
+                        $args = func_get_args();
+                        $event = end($args);
                     }
+                    $debugbar['events']->info("Received event: ". $event);
                 });
         }
 
         if($this->shouldCollect('views', true) and isset($this->app['events'])){
             $collectData = $this->app['config']->get('laravel-debugbar::config.options.views.data', true);
             $this->addCollector(new ViewCollector($collectData));
             $this->app['events']->listen('composing:*', function($view) use($debugbar){
-                    if($debugbar->isEnabled()){
-                        $debugbar['views']->addView($view);
-                    }
+                    $debugbar['views']->addView($view);
                 });
         }
 
@@ -197,13 +193,11 @@ public function boot(){
                 $this['messages']->aggregate($logger);
                 $this->app['log']->listen(function($level, $message, $context) use($debugbar, $logger)
                     {
-                        if($debugbar->isEnabled()){
-                            if(is_array($message) or is_object($message)){
-                                $message = json_encode($message);
-                            }
-                            $log = '['.date('H:i:s').'] '. "LOG.$level: " . $message . (!empty($context) ? ' '.json_encode($context) : '');
-                            $logger->addMessage($log, $level);
+                        if(is_array($message) or is_object($message)){
+                            $message = json_encode($message);
                         }
+                        $log = '['.date('H:i:s').'] '. "LOG.$level: " . $message . (!empty($context) ? ' '.json_encode($context) : '');
+                        $logger->addMessage($log, $level);
                     });
             }else{
                 $this->addCollector(new MonologCollector( $this->app['log']->getMonolog() ));
@@ -227,9 +221,7 @@ public function boot(){
 
             $db->listen(function($query, $bindings, $time, $connectionName) use ($debugbar, $queryCollector)
                 {
-                    if($debugbar->isEnabled()){
-                        $queryCollector->addQuery($query, $bindings, $time, $connectionName);
-                    }
+                    $queryCollector->addQuery($query, $bindings, $time, $connectionName);
                 });
         }
 
