Improved Utils::url() to support query strings

getgrav · Aug 6, 2018 · 18d405d · 18d405d
1 parent 34fa50f
commit 18d405d
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,7 +4,9 @@
 1. [](#new)
     * Added `Uri::method()` to get current HTTP method (GET/POST etc)
     * `FormatterInterface`: Added `getSupportedFileExtensions()` and `getDefaultFileExtension()` methods
-
+1. [](#improved)
+    * Improved `Utils::url()` to support query strings
+
 # v1.5.0-rc.1
 ## 07/31/2018
 

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
@@ -45,8 +45,15 @@ public static function url($input, $domain = false)
             /** @var UniformResourceLocator $locator */
             $locator = Grav::instance()['locator'];
 
-            // Get relative path to the resource (or false if not found).
-            $resource = $locator->findResource($input, false);
+            $parts = Uri::parseUrl($input);
+
+            $resource = $locator->findResource("{$parts['scheme']}://{$parts['host']}{$parts['path']}", false);
+
+            if (isset($parts['query'])) {
+                $resource = $resource . '?' . $parts['query'];
+            }
+
+
         } else {
             $resource = $input;
         }