Optimize the code by ditching the count query; we don't need it.

1 files changed, 2 insertions, 10 deletions

diff --git a/modules/image_block/helpers/image_block_theme.php b/modules/image_block/helpers/image_block_theme.php
index 96ee58e2..bf87c852 100644
--- a/modules/image_block/helpers/image_block_theme.php
+++ b/modules/image_block/helpers/image_block_theme.php
@@ -19,15 +19,6 @@
  */
 class image_block_theme_Core {
   static function sidebar_blocks($theme) {
-    // Leave as a count so we can filter based on viewable items.
-    $viewable_items = ORM::factory("item")
-      ->viewable()
-      ->select("COUNT(*) AS C")
-      ->find()->C;
-    if (empty($viewable_items)) {
-      return "";
-    }
-
     $block = new Block();
     $block->css_id = "gImageBlock";
     $block->title = t("Random Image");
@@ -43,6 +34,7 @@ class image_block_theme_Core {
       ->find_all(1);
 
     if ($items->count() == 0) {
+      // Try once more.  If this fails, just ditch the block altogether
       $items = ORM::factory("item")
         ->viewable()
         ->where("type !=", "album")
@@ -50,7 +42,7 @@ class image_block_theme_Core {
         ->orderby(array("rand_key" => "DESC"))
         ->find_all(1);
     }
- 
+
     $block->content->item = $items->current();
 
     return $items->count() == 0 ? "" : $block;