summaryrefslogtreecommitdiff
path: root/modules/organize/controllers
diff options
context:
space:
mode:
authorBeckett Madden-Woods <beckett@beckettmw.com>2011-01-09 04:03:31 +0000
committerBeckett Madden-Woods <beckett@beckettmw.com>2011-01-09 04:03:31 +0000
commit1a1a05ed9446bb57a0ef457a8cbf8beca5619c31 (patch)
tree10030f48f23928f8fdedcf7d8db0c6fa3cd5f5a0 /modules/organize/controllers
parentb78a1319ae10841ff6be00d041b3d8d6967ca7a3 (diff)
parent4c80ed53d2a3fa3392d2da61c730b6d30de9f2be (diff)
Merge commit 'upstream/master'
Diffstat (limited to 'modules/organize/controllers')
-rw-r--r--modules/organize/controllers/organize.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/modules/organize/controllers/organize.php b/modules/organize/controllers/organize.php
index 4e6178b6..df3130be 100644
--- a/modules/organize/controllers/organize.php
+++ b/modules/organize/controllers/organize.php
@@ -63,7 +63,7 @@ class Organize_Controller extends Controller {
$dims = $child->scale_dimensions(120);
$data["children"][] = array(
"id" => $child->id,
- "thumb_url" => $child->thumb_url(),
+ "thumb_url" => $child->has_thumb() ? $child->thumb_url() : null,
"width" => $dims[1],
"height" => $dims[0],
"type" => $child->type,