summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/file_proxy.php
diff options
context:
space:
mode:
Diffstat (limited to 'modules/gallery/controllers/file_proxy.php')
-rw-r--r--modules/gallery/controllers/file_proxy.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index 1901bd9f..1f885e53 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -32,13 +32,12 @@ class File_Proxy_Controller extends Controller {
$request_uri = $this->input->server("REQUEST_URI");
$request_uri = preg_replace("/\?.*/", "", $request_uri);
- // Firefox converts ~ to %7E breaking our url comparison, below. Convert that back here.
- $request_uri = str_replace("%7E", "~", $request_uri);
+ // Unescape %7E ("~") and %20 (" ")
+ $request_uri = str_replace(array("%7E", "%20"), array("~", " "), $request_uri);
// var_uri: http://example.com/gallery3/var/
$var_uri = url::file("var/");
-
// Make sure that the request is for a file inside var
$offset = strpos($request_uri, $var_uri);
if ($offset === false) {