summaryrefslogtreecommitdiff
path: root/modules/gallery
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2011-01-11 17:53:16 -0800
committerBharat Mediratta <bharat@menalto.com>2011-01-11 17:53:16 -0800
commite3df9c1611861cc5a294d4c758b6220712d1e698 (patch)
tree411f2bacbe00a65ea81a17ae956028191bca488d /modules/gallery
parentee53744aa73b06f262122b6236014618fe6d742c (diff)
parent7f6d87166df138073d85dd5201de8b9d19bc6cd2 (diff)
Merge branch 'Ticket#1518' of git://github.com/Joe7/gallery3
Diffstat (limited to 'modules/gallery')
-rw-r--r--modules/gallery/controllers/file_proxy.php5
1 files changed, 0 insertions, 5 deletions
diff --git a/modules/gallery/controllers/file_proxy.php b/modules/gallery/controllers/file_proxy.php
index c6051dfd..0400d7c4 100644
--- a/modules/gallery/controllers/file_proxy.php
+++ b/modules/gallery/controllers/file_proxy.php
@@ -45,11 +45,6 @@ class File_Proxy_Controller extends Controller {
$file_uri = substr($request_uri, strlen($var_uri));
- // Make sure that we don't leave the var dir
- if (strpos($file_uri, "..") !== false) {
- throw new Kohana_404_Exception();
- }
-
list ($type, $path) = explode("/", $file_uri, 2);
if ($type != "resizes" && $type != "albums" && $type != "thumbs") {
throw new Kohana_404_Exception();