summaryrefslogtreecommitdiff
path: root/modules/gallery/controllers/uploader.php
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2013-02-12 09:24:37 -0800
committerBharat Mediratta <bharat@menalto.com>2013-02-12 09:24:37 -0800
commit8a1133952e534e0c15d67b8bd7f614e05ca75525 (patch)
tree16695f95900df97cc741598b8440b4d5637e4d0c /modules/gallery/controllers/uploader.php
parent9ed67350331ff32e6f42a53ad1ba09d1533e8af9 (diff)
parentd04a6fc87d96b70ab0f70414f2ff40d1f1e7f482 (diff)
Merge pull request #134 from shadlaws/fix_2001
#2001 - Make filename sanitizing more consistent.
Diffstat (limited to 'modules/gallery/controllers/uploader.php')
-rw-r--r--modules/gallery/controllers/uploader.php4
1 files changed, 0 insertions, 4 deletions
diff --git a/modules/gallery/controllers/uploader.php b/modules/gallery/controllers/uploader.php
index 55c65c95..78437071 100644
--- a/modules/gallery/controllers/uploader.php
+++ b/modules/gallery/controllers/uploader.php
@@ -63,10 +63,6 @@ class Uploader_Controller extends Controller {
$item->parent_id = $album->id;
$item->set_data_file($temp_filename);
- // Remove double extensions from the filename - they'll be disallowed in the model but if
- // we don't do it here then it'll result in a failed upload.
- $item->name = legal_file::smash_extensions($item->name);
-
$path_info = @pathinfo($temp_filename);
if (array_key_exists("extension", $path_info) &&
legal_file::get_movie_extensions($path_info["extension"])) {