Fix expectsJson returning true when expecting html

laravel · Dec 18, 2017 · 5c9d906 · 5c9d906
1 parent 1c0a18c
commit 5c9d906
Showing 1 changed file with 13 additions and 1 deletion.
diff --git a/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php b/src/Illuminate/Http/Concerns/InteractsWithContentTypes.php
@@ -41,7 +41,7 @@ public function isJson()
      */
     public function expectsJson()
     {
-        return ($this->ajax() && ! $this->pjax()) || $this->wantsJson();
+        return ($this->ajax() && ! $this->pjax() && ! $this->wantsHtml()) || $this->wantsJson();
     }
 
     /**
@@ -56,6 +56,18 @@ public function wantsJson()
         return isset($acceptable[0]) && Str::contains($acceptable[0], ['/json', '+json']);
     }
 
+    /**
+     * Determine if the current request is asking for HTML in return.
+     *
+     * @return bool
+     */
+    public function wantsHtml()
+    {
+        $acceptable = $this->getAcceptableContentTypes();
+
+        return isset($acceptable[0]) && Str::contains($acceptable[0], ['/html', '/xhtml', '+html']);
+    }
+
     /**
      * Determines whether the current requests accepts a given content type.
      *