summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Almdal <tnalmdal@shaw.ca>2009-07-02 07:53:24 -0700
committerTim Almdal <tnalmdal@shaw.ca>2009-07-02 07:53:24 -0700
commita13ddfea8fb461d38263fc90f40ecbe37a15029b (patch)
tree5b28e1887c2b004c5ae80ba066e5ca1fa7a5ea5a
parentb6bf7a58813046904c429a3390dd8e6576d574f6 (diff)
Suppress the filesize error if the thumbnail is not found so we can get
an EMPTY_INPUT_FILE exception which we can then log and continue.
-rw-r--r--modules/g2_import/helpers/g2_import.php2
-rw-r--r--modules/gallery/helpers/graphics.php2
2 files changed, 1 insertions, 3 deletions
diff --git a/modules/g2_import/helpers/g2_import.php b/modules/g2_import/helpers/g2_import.php
index 93d92659..71199eaf 100644
--- a/modules/g2_import/helpers/g2_import.php
+++ b/modules/g2_import/helpers/g2_import.php
@@ -667,8 +667,6 @@ class g2_import_Core {
}
}
}
- } else {
- // @todo Figure out away to create the thumbnail and resizes?
}
$item->save();
}
diff --git a/modules/gallery/helpers/graphics.php b/modules/gallery/helpers/graphics.php
index 71b8ddd8..bbae0602 100644
--- a/modules/gallery/helpers/graphics.php
+++ b/modules/gallery/helpers/graphics.php
@@ -195,7 +195,7 @@ class graphics_Core {
self::init_toolkit();
}
- if (filesize($input_file) == 0) {
+ if (@filesize($input_file) == 0) {
throw new Exception("@todo EMPTY_INPUT_FILE");
}