diff options
| author | Tim Almdal <tnalmdal@shaw.ca> | 2009-08-05 06:51:27 -0700 |
|---|---|---|
| committer | Tim Almdal <tnalmdal@shaw.ca> | 2009-08-05 06:51:27 -0700 |
| commit | 2f63a5379f668188d4e1a46231246a25445e40fa (patch) | |
| tree | 40f18712ebff843b2623639cc36321df58ce06e0 /modules/server_add | |
| parent | a25f08d433d504a53763feb358a1aa7f5f798de6 (diff) | |
| parent | b9a6cd45ba0b32a115dedd8b3fa3962eb82202e1 (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add')
| -rw-r--r-- | modules/server_add/controllers/server_add.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/modules/server_add/controllers/server_add.php b/modules/server_add/controllers/server_add.php index f68392ce..bfb96506 100644 --- a/modules/server_add/controllers/server_add.php +++ b/modules/server_add/controllers/server_add.php @@ -150,7 +150,8 @@ class Server_Add_Controller extends Admin_Controller { $queue[] = array($child, $entry->id); } else { $ext = strtolower(pathinfo($child, PATHINFO_EXTENSION)); - if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4"))) { + if (in_array($ext, array("gif", "jpeg", "jpg", "png", "flv", "mp4")) && + filesize($child) > 0) { $child_entry = ORM::factory("server_add_file"); $child_entry->task_id = $task->id; $child_entry->file = $child; |