From ff8a8dde282e2e2373073362a06537e30037346f Mon Sep 17 00:00:00 2001 From: Ole Vik Date: Sun, 4 Jun 2017 22:24:29 +0200 Subject: [PATCH] Fix Windows routing with built-in server (#1502) 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 732df70de..8cfcb1017 100644 --- a/system/src/Grav/Common/Page/Medium/ImageMedium.php +++ b/system/src/Grav/Common/Page/Medium/ImageMedium.php @@ -166,7 +166,7 @@ class ImageMedium extends Medium $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 fb57aed8c..d63f12ed7 100644 --- a/system/src/Grav/Common/Page/Medium/Medium.php +++ b/system/src/Grav/Common/Page/Medium/Medium.php @@ -175,7 +175,7 @@ class Medium extends Data implements RenderableInterface $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(), '/'), '\\'); } /**