summaryrefslogtreecommitdiff
path: root/modules/server_add/controllers/server_add.php
diff options
context:
space:
mode:
authorChad Kieffer <ckieffer@gmail.com>2009-08-04 23:38:11 -0600
committerChad Kieffer <ckieffer@gmail.com>2009-08-04 23:38:11 -0600
commit58dbee03e5ef44280fff57637c7b51e5d614ba66 (patch)
tree944bc3310efbda6a8a04f42918d31b68595f5ae7 /modules/server_add/controllers/server_add.php
parent9a55eb4df8346f9a81fbd4a1fb4daa7b807e80e0 (diff)
parentb9a6cd45ba0b32a115dedd8b3fa3962eb82202e1 (diff)
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/server_add/controllers/server_add.php')
-rw-r--r--modules/server_add/controllers/server_add.php3
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;