Only reflash when session is set

evgeniy-n · Feb 17, 2016 · 515cb00 · 515cb00
1 parent 3f9a465
commit 515cb00
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/Controllers/BaseController.php b/src/Controllers/BaseController.php
@@ -13,7 +13,10 @@ class BaseController extends Controller
         public function __construct(Request $request, LaravelDebugbar $debugbar)
         {
             $this->debugbar = $debugbar;
-            $request->session()->reflash();
+
+            if ($request->hasSession()){
+                $request->session()->reflash();
+            }
         }
     }
 
@@ -26,7 +29,10 @@ class BaseController
         public function __construct(Request $request, LaravelDebugbar $debugbar)
         {
             $this->debugbar = $debugbar;
-            $request->session()->reflash();
+
+            if ($request->hasSession()){
+                $request->session()->reflash();
+            }
         }
     }
-}
+}
diff --git a/src/LaravelDebugbar.php b/src/LaravelDebugbar.php
@@ -110,10 +110,6 @@ public function boot()
             return;
         }
 
-        if ($this->isDebugbarRequest() && $this->app->bound(SessionManager::class)) {
-            $this->app->make(SessionManager::class)->reflash();
-        }
-
         /** @var \Barryvdh\Debugbar\LaravelDebugbar $debugbar */
         $debugbar = $this;