Merge pull request #486 from jjrom/develop

[IMPORTANT] Use $request_uri instead of $uri in nginx to get raw inpu…

Author: jjrom

app/resto/core/RestoConstants.php

@@ -20,7 +20,7 @@ class RestoConstants
     // [IMPORTANT] Starting resto 7.x, default routes are defined in RestoRouter class
 
     // resto version
-    const VERSION = '9.5.5';
+    const VERSION = '9.5.6';
 
     /* ============================================================
      *              NEVER EVER TOUCH THESE VALUES

app/resto/core/RestoContext.php

@@ -393,7 +393,7 @@ private function setQuery()
      */
     private function setPath()
     {
-        $restoUrl = filter_input(INPUT_GET, '_path', FILTER_UNSAFE_RAW);
+        $restoUrl = explode('?', filter_input(INPUT_GET, '_path', FILTER_UNSAFE_RAW))[0];
         if (isset($restoUrl)) {
             $this->path = ($restoUrl !== '/' && substr($restoUrl, -1) === '/' ? substr($restoUrl, 0, strlen($restoUrl) - 1) : $restoUrl);
         }

build/resto/container_root/etc/nginx/sites-available/default

@@ -11,7 +11,8 @@ server {
   index index.php;
 
   location / {
-    try_files $uri /index.php?_path=$uri&$args;
+  #  try_files $uri /index.php?_path=$uri&$args;
+    try_files $uri /index.php?_path=$request_uri&$args;
   }
 
   location /static/ {