diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-05-31 23:28:42 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-05-31 23:28:42 -0700 |
| commit | 3c24d9476618496c8f2e1ca2f6025fa157120e43 (patch) | |
| tree | e3d8b381098affa3081cc95cd74ebeabef972ab3 /modules/gallery/controllers/file_proxy.php | |
| parent | 463b3454ae7633815e24cdf86e81c57409dd15a9 (diff) | |
| parent | 79a05adb9d941671cefbdf6b1cc97f0cd84fabf3 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/controllers/file_proxy.php')
| -rw-r--r-- | modules/gallery/controllers/file_proxy.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php index 2037ad98..dfdb4f34 100644 --- a/modules/gallery/controllers/file_proxy.php +++ b/modules/gallery/controllers/file_proxy.php @@ -32,6 +32,9 @@ 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); + // var_uri: http://example.com/gallery3/var/ $var_uri = url::file("var/"); |