Merge branch 'recaller-request-null' of https://github.com/rdrnnr87/f…

…ramework into rdrnnr87-recaller-request-null
laravel · Jan 31, 2017 · 84d4839 · 84d4839
2 parents b375161 + 7bbcb88
commit 84d4839
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/Illuminate/Auth/SessionGuard.php b/src/Illuminate/Auth/SessionGuard.php
@@ -183,7 +183,7 @@ protected function userFromRecaller($recaller)
      */
     protected function recaller()
     {
-        if ($recaller = $this->request->cookies->get($this->getRecallerName())) {
+        if (! is_null($this->request) && $recaller = $this->request->cookies->get($this->getRecallerName())) {
             return new Recaller($recaller);
         }
     }