summaryrefslogtreecommitdiff
path: root/modules/exif/helpers
diff options
context:
space:
mode:
authorBharat Mediratta <bharat@menalto.com>2009-05-28 21:42:18 -0700
committerBharat Mediratta <bharat@menalto.com>2009-05-28 21:42:18 -0700
commit0097803efc1c71711bf9ccf5015fe43e75f8f28d (patch)
treeb48e0013b55601d4d856350a3213880a424911ea /modules/exif/helpers
parentf56e095aeb6e5544360136a48373300f3cecb715 (diff)
parent356bac0db0dca5d2b8102b31b6c6b9509f595c29 (diff)
Merge branch 'master' of git://github.com/gallery/gallery3
Diffstat (limited to 'modules/exif/helpers')
-rw-r--r--modules/exif/helpers/exif.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/modules/exif/helpers/exif.php b/modules/exif/helpers/exif.php
index c488bbd4..970be5ac 100644
--- a/modules/exif/helpers/exif.php
+++ b/modules/exif/helpers/exif.php
@@ -88,6 +88,10 @@ class exif_Core {
$record = ORM::factory("exif_record")
->where("item_id", $item->id)
->find();
+ if (!$record->loaded) {
+ return array();
+ }
+
$definitions = self::_keys();
$keys = unserialize($record->data);
foreach ($keys as $key => $value) {