Fix for illegal offset scheme errors

getgrav · Dec 8, 2017 · 6628bbb · 6628bbb
1 parent 70f6529
commit 6628bbb
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,11 +1,15 @@
+# v1.3.11
+## mm/dd/2017
+
+1. [](#bugfix)
+    * Fixed issue with _illegal scheme offset_ in `Uri::convertUrl()` [page-inject#8](https://github.com/getgrav/grav-plugin-page-inject/issues/8)
+
 # v1.3.10
 ## 12/06/2017
 
 1. [](#bugfix)
     * Reverted GPM Local pull request as it broken admin [#1742](https://github.com/getgrav/grav/issues/1742) 
 
-1. [](#new)
-
 # v1.3.9
 ## 12/05/2017
 

diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
@@ -941,7 +941,7 @@ public static function convertUrl(Page $page, $url, $type = 'link', $absolute =
         }
 
         // handle absolute URLs
-        if (!$external && ($absolute === true || $grav['config']->get('system.absolute_urls', false))) {
+        if (is_array($url) && !$external && ($absolute === true || $grav['config']->get('system.absolute_urls', false))) {
 
             $url['scheme'] = $uri->scheme(true);
             $url['host'] = $uri->host();
@@ -983,17 +983,18 @@ public static function convertUrl(Page $page, $url, $type = 'link', $absolute =
             }
         }
 
+        // Handle route only
+        if ($route_only) {
+            $url_path = str_replace($base_url, '', $url_path);
+        }
+
         // transform back to string/array as needed
         if (is_array($url)) {
             $url['path'] = $url_path;
         } else {
             $url = $url_path;
         }
 
-        if ($route_only) {
-            $url = str_replace($base_url, '', $url);
-        }
-
         return $url;
     }