Fixed Uri::parseUrl($url) with no path (part 2)

getgrav · Aug 7, 2018 · 16d2f60 · 16d2f60
1 parent 816a3eb
commit 16d2f60
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -880,7 +880,23 @@ public static function convertUrl(Page $page, $url, $type = 'link', $absolute =
     public static function parseUrl($url)
     {
         $grav = Grav::instance();
-        $parts = parse_url($url);
+
+        $encodedUrl = preg_replace_callback(
+            '%[^:/@?&=#]+%usD',
+            function ($matches) { return rawurlencode($matches[0]); },
+            $url
+        );
+
+        $parts = parse_url($encodedUrl);
+
+        if (false === $parts) {
+            return false;
+        }
+
+        foreach($parts as $name => $value) {
+            $parts[$name] = rawurldecode($value);
+        }
+
         if (!isset($parts['path'])) {
             $parts['path'] = '';
         }

diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php
@@ -47,10 +47,15 @@ public static function url($input, $domain = false)
 
             $parts = Uri::parseUrl($input);
 
-            $resource = $locator->findResource("{$parts['scheme']}://{$parts['host']}{$parts['path']}", false);
+            if ($parts) {
+                $resource = $locator->findResource("{$parts['scheme']}://{$parts['host']}{$parts['path']}", false);
 
-            if (isset($parts['query'])) {
-                $resource = $resource . '?' . $parts['query'];
+                if (isset($parts['query'])) {
+                    $resource = $resource . '?' . $parts['query'];
+                }
+            } else {
+                // Not a valid URL (can still be a stream).
+                $resource = $locator->findResource($input, false);
             }