Refix #812, by removing the decoding in file_proxy instead of not encoding in Item_Model when creating the relative_path_cache.

2 files changed, 1 insertions, 5 deletions

diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 8cb90c50..acfd6eb9 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -32,10 +32,6 @@ class File_Proxy_Controller extends Controller {
     $request_uri = $this->input->server("REQUEST_URI");
     $request_uri = preg_replace("/\?.*/", "", $request_uri);
 
-    // Unescape %7E (~), %20 ( ) and %27 (')
-    // @todo: figure out why we have to do this and unescape everything appropriate
-    $request_uri = str_replace(array("%7E", "%20", "%27"), array("~", " ", "'"), $request_uri);
-
     // var_uri: http://example.com/gallery3/var/
     $var_uri = url::file("var/");
 
diff --git a/modules/gallery/models/item.php b/modules/gallery/models/item.php
index 63ab3598..fc0f0193 100644
--- a/modules/gallery/models/item.php
+++ b/modules/gallery/models/item.php
@@ -294,7 +294,7 @@ class Item_Model extends ORM_MPTT {
              ->orderby("left_ptr", "ASC")
              ->get() as $row) {
       // Don't encode the names segment
-      $names[] = $row->name;
+      $names[] = rawurlencode($row->name);
       $slugs[] = rawurlencode($row->slug);
     }
     $this->relative_path_cache = implode($names, "/");