From f82b6f17b4cb53a0363e1b1d16a4e914d109f464 Mon Sep 17 00:00:00 2001 From: Ole Vik Date: Tue, 30 May 2017 20:56:57 +0200 Subject: [PATCH] Fix Windows routing with built-in server Strips backward-slashes from Medium.php's and ImageMedium.php's url() method. --- system/src/Grav/Common/Page/Medium/ImageMedium.php | 2 +- system/src/Grav/Common/Page/Medium/Medium.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/system/src/Grav/Common/Page/Medium/ImageMedium.php b/system/src/Grav/Common/Page/Medium/ImageMedium.php index 732df70deb..8cfcb10179 100644 --- a/system/src/Grav/Common/Page/Medium/ImageMedium.php +++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php @@ -166,7 +166,7 @@ public function url($reset = true) $this->reset(); } - return Grav::instance()['base_url'] . '/' . ltrim($output . $this->querystring() . $this->urlHash(), '/'); + return trim(Grav::instance()['base_url'] . '/' . ltrim($output . $this->querystring() . $this->urlHash(), '/'), '\\'); } /** diff --git a/system/src/Grav/Common/Page/Medium/Medium.php b/system/src/Grav/Common/Page/Medium/Medium.php index fb57aed8cb..d63f12ed71 100644 --- a/system/src/Grav/Common/Page/Medium/Medium.php +++ b/system/src/Grav/Common/Page/Medium/Medium.php @@ -175,7 +175,7 @@ public function url($reset = true) $this->reset(); } - return Grav::instance()['base_url'] . '/' . ltrim($output . $this->querystring() . $this->urlHash(), '/'); + return trim(Grav::instance()['base_url'] . '/' . ltrim($output . $this->querystring() . $this->urlHash(), '/'), '\\'); } /**