1 files changed, 7 insertions, 8 deletions
diff --git a/modules/image_block/helpers/image_block_block.php b/modules/image_block/helpers/image_block_block.php
index f28e775f..185df850 100644
--- a/modules/image_block/helpers/image_block_block.php
+++ b/modules/image_block/helpers/image_block_block.php
@@ -26,14 +26,13 @@ class image_block_block_Core {
     $block = "";
     switch ($block_id) {
     case "random_image":
-      $block = new Block();
-      $block->css_id = "g-image-block";
-      $block->title = t("Random image");
-      $block->content = new View("image_block_block.html");
-      $block->content->items = item::random_query(array(array("type", "!=", "album")))->find_all(1);
-
-      if ($block->content->items->count() == 0) {
-        $block = "";
+      $item = item::random_query(array(array("type", "!=", "album")))->find_all(1)->current();
+      if ($item && $item->loaded()) {
+        $block = new Block();
+        $block->css_id = "g-image-block";
+        $block->title = t("Random image");
+        $block->content = new View("image_block_block.html");
+        $block->content->item = $item;
       }
       break;
     }