Upgrade to 3.3.0

2019-11-05 09:35:58 +01:00
parent 447a9dd266
commit a431716732
186 changed files with 3068 additions and 1458 deletions
--- a/kirby/src/Cms/AppErrors.php
+++ b/kirby/src/Cms/AppErrors.php
@@ -29,18 +29,17 @@ trait AppErrors

    protected function handleErrors()
    {
-        $request = $this->request();
-
-        // TODO: implement acceptance
-        if ($request->ajax()) {
-            return $this->handleJsonErrors();
+        if ($this->request()->cli() === true) {
+            $this->handleCliErrors();
+            return;
        }

-        if ($request->cli()) {
-            return $this->handleCliErrors();
+        if ($this->visitor()->prefersJson() === true) {
+            $this->handleJsonErrors();
+            return;
        }

-        return $this->handleHtmlErrors();
+        $this->handleHtmlErrors();
    }

    protected function handleHtmlErrors()