Backport reflash fix to v2.1.2

artemzi · Feb 17, 2016 · 3fab290 · 3fab290
1 parent 974fd16
commit 3fab290
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -2,16 +2,21 @@
 
 use Barryvdh\Debugbar\LaravelDebugbar;
 use Illuminate\Routing\Controller;
+use Illuminate\Http\Request;
 
 if (class_exists('Illuminate\Routing\Controller')) {
 
     class BaseController extends Controller
     {
         protected $debugbar;
 
-        public function __construct(LaravelDebugbar $debugbar)
+        public function __construct(Request $request, LaravelDebugbar $debugbar)
         {
             $this->debugbar = $debugbar;
+
+            if ($request->hasSession()){
+                $request->session()->reflash();
+            }
         }
     }
 
@@ -21,10 +26,13 @@ class BaseController
     {
         protected $debugbar;
 
-        public function __construct(LaravelDebugbar $debugbar)
+        public function __construct(Request $request, LaravelDebugbar $debugbar)
         {
             $this->debugbar = $debugbar;
+
+            if ($request->hasSession()){
+                $request->session()->reflash();
+            }
         }
     }
-}
-
+}
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -107,10 +107,6 @@ public function boot()
             return;
         }
 
-        if ($this->isDebugbarRequest()) {
-            $this->app['session']->reflash();
-        }
-
         /** @var \Barryvdh\Debugbar\LaravelDebugbar $debugbar */
         $debugbar = $this;