diff options
| author | Chad Kieffer <ckieffer@gmail.com> | 2009-08-28 13:48:54 -0600 |
|---|---|---|
| committer | Chad Kieffer <ckieffer@gmail.com> | 2009-08-28 13:48:54 -0600 |
| commit | 5a2853bca1ea9a9231e01814df9aa373bf50d19c (patch) | |
| tree | 431264bfb9de1d8bbdc6a9ba7775a363381f96e8 /modules/gallery/helpers/photo.php | |
| parent | f1e008a14f2dfb51d1204dad3deb19e2e3df16c8 (diff) | |
| parent | 6dcfdb6432d556f43736d60de8f310f247868bfa (diff) | |
Merge branch 'master' of git@github.com:gallery/gallery3
Diffstat (limited to 'modules/gallery/helpers/photo.php')
| -rw-r--r-- | modules/gallery/helpers/photo.php | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/modules/gallery/helpers/photo.php b/modules/gallery/helpers/photo.php index 5cf37de1..96a66d29 100644 --- a/modules/gallery/helpers/photo.php +++ b/modules/gallery/helpers/photo.php @@ -109,8 +109,12 @@ class photo_Core { // there's only one save() happening here. module::event("item_created", $photo); - // Build our thumbnail/resizes - graphics::generate($photo); + // Build our thumbnail/resizes. If we fail to build thumbnail/resize we assume that the image + // is bad in some way and discard it. + if (!graphics::generate($photo)) { + $photo->delete(); + throw new Exception("@todo BAD_IMAGE_FILE"); + } // If the parent has no cover item, make this it. if (access::can("edit", $parent) && $parent->album_cover_item_id == null) { |