From 9eb06da9a98b8d520070abf1cb44fda4c8e6d204 Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Sun, 5 Oct 2014 18:43:33 -0600
Subject: [PATCH] Added support for spaces in page and media urls

---
 system/src/Grav/Common/Grav.php | 5 +++--
 system/src/Grav/Common/Uri.php  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/system/src/Grav/Common/Grav.php b/system/src/Grav/Common/Grav.php
index 2b6e1f0f6..ccc10789a 100644
--- a/system/src/Grav/Common/Grav.php
+++ b/system/src/Grav/Common/Grav.php
@@ -100,8 +100,9 @@ class Grav extends Container
                     $page = $c['pages']->dispatch($path_parts['dirname']);
                     if ($page) {
                         $media = $page->media()->all();
-                        if (isset($media[$path_parts['basename']])) {
-                            $medium = $media[$path_parts['basename']];
+                        $media_file = urldecode($path_parts['basename']);
+                        if (isset($media[$media_file])) {
+                            $medium = $media[$media_file];
 
                             // loop through actions for the image and call them
                             foreach ($c['uri']->query(null,true) as $action => $params) {
diff --git a/system/src/Grav/Common/Uri.php b/system/src/Grav/Common/Uri.php
index ed3664f83..301363d63 100644
--- a/system/src/Grav/Common/Uri.php
+++ b/system/src/Grav/Common/Uri.php
@@ -133,7 +133,7 @@ class Uri
      */
     public function route($absolute = false, $domain = false)
     {
-        return ($absolute ? $this->rootUrl($domain) : '') . '/' . implode('/', $this->paths);
+        return urldecode(($absolute ? $this->rootUrl($domain) : '') . '/' . implode('/', $this->paths));
     }
 
     /**