Merge branch 'develop' of https://github.com/getgrav/grav into 2.0

# Conflicts: # CHANGELOG.md
getgrav · Oct 13, 2017 · 731fe50 · 731fe50
2 parents c7be8eb + cc69591
commit 731fe50
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,13 @@
 1. [](#improved)
     * Make it possible to include debug bar also into non-HTML responses
 
+# v1.3.6
+## 10/12/2017
+
+1. [](#bugfix)
+    * Regression: Ajax error in Nginx [admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244)
+    * Remove the `_url=$uri` portion of the the Nginx `try_files` command [admin#1244](https://github.com/getgrav/grav-plugin-admin/issues/1244)
+
 # v1.3.5
 ## 10/11/2017
 

diff --git a/system/defines.php b/system/defines.php
@@ -8,7 +8,7 @@
 
 // Some standard defines
 define('GRAV', true);
-define('GRAV_VERSION', '1.3.5');
+define('GRAV_VERSION', '1.3.6');
 //define('GRAV_TESTING', true);
 define('DS', '/');
 

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -90,6 +90,13 @@ protected function createFromEnvironment(array $env)
             $this->query = parse_url('http://example.com' . $request_uri, PHP_URL_QUERY);
         }
 
+        // Support ngnix routes.
+        if (strpos($this->query, '_url=') === 0) {
+            parse_str($this->query, $query);
+            unset($query['_url']);
+            $this->query = http_build_query($query);
+        }
+
         // Build fragment.
         $this->fragment = null;
 

diff --git a/tests/unit/Grav/Common/UriTest.php b/tests/unit/Grav/Common/UriTest.php
@@ -552,6 +552,29 @@ class UriTest extends \Codeception\TestCase\Test
             'addNonce' => 'http://localhost/a-page.json/nonce:{{nonce}}',
             '__toString' => 'http://localhost/a-page', // FIX ME <-
         ],
+        'http://localhost/admin/ajax.json/task:getnewsfeed' => [
+            'scheme' => 'http://',
+            'user' => null,
+            'password' => null,
+            'host' => 'localhost',
+            'port' => 80,
+            'path' => '/admin/ajax',
+            'query' => '',
+            'fragment' => null,
+
+            'route' => '/admin/ajax',
+            'paths' => ['admin', 'ajax'],
+            'params' => '/task:getnewsfeed',
+            'url' => '/admin/ajax',
+            'environment' => 'localhost',
+            'basename' => 'ajax.json',
+            'base' => 'http://localhost',
+            'currentPage' => 1,
+            'rootUrl' => 'http://localhost',
+            'extension' => 'json',
+            'addNonce' => 'http://localhost/admin/ajax.json/task:getnewsfeed/nonce:{{nonce}}',
+            '__toString' => 'http://localhost/admin/ajax/task:getnewsfeed',
+        ],
         'http://localhost/grav/admin/media.json/route:L1VzZXJzL3JodWsvd29ya3NwYWNlL2dyYXYtZGVtby1zYW1wbGVyL3VzZXIvYXNzZXRzL3FRMXB4Vk1ERTNJZzh5Ni5qcGc=/task:removeFileFromBlueprint/proute:/blueprint:Y29uZmlnL2RldGFpbHM=/type:config/field:deep.nested.custom_file/path:dXNlci9hc3NldHMvcVExcHhWTURFM0lnOHk2LmpwZw==' => [
             'scheme' => 'http://',
             'user' => null,

diff --git a/webserver-configs/nginx.conf b/webserver-configs/nginx.conf
@@ -12,7 +12,7 @@ server {
     # `location /subfolder {`
     # and the rewrite to use `/subfolder/index.php`
     location / {
-        try_files $uri $uri/ /index.php?_url=$uri&$query_string;
+        try_files $uri $uri/ /index.php?$query_string;
     }
     ## End - Index