diff options
| author | Bharat Mediratta <bharat@menalto.com> | 2013-02-15 13:00:26 -0500 |
|---|---|---|
| committer | Bharat Mediratta <bharat@menalto.com> | 2013-02-15 13:00:26 -0500 |
| commit | 96a01c86d9bd15f9dc91c60be6f236deab2ffad9 (patch) | |
| tree | db06b9a5ab2b03a0475f536b9792435059f999e9 /modules/gallery/controllers/uploader.php | |
| parent | 16b8b8d16b8b46fe1e60b2a86f9ee5883dbc892f (diff) | |
| parent | 5b6c138da1e53e93e4de8079885fcef29d12e673 (diff) | |
Merge branch 'master' into jquery_190
Diffstat (limited to 'modules/gallery/controllers/uploader.php')
| -rw-r--r-- | modules/gallery/controllers/uploader.php | 4 |
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"])) { |