From 692332820d4b0ecdcdfc84aae75ddf1d153e7f87 Mon Sep 17 00:00:00 2001
From: "shaver%mozilla.org"
 <shaver%mozilla.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Tue, 24 Oct 2006 10:58:21 +0000
Subject: [PATCH] A bit of defense in the bookmark-fetching, and make sure we
 get the real preview image out!

git-svn-id: svn://10.0.0.236/trunk@214065 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/webtools/addons/public/htdocs/bookmarks.php | 4 +++-
 mozilla/webtools/addons/shared/lib/amo.class.php    | 3 ++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/mozilla/webtools/addons/public/htdocs/bookmarks.php b/mozilla/webtools/addons/public/htdocs/bookmarks.php
index 8b6e984ecc9..f6fd3dd2397 100644
--- a/mozilla/webtools/addons/public/htdocs/bookmarks.php
+++ b/mozilla/webtools/addons/public/htdocs/bookmarks.php
@@ -15,7 +15,9 @@ setApp();
 $amo = new AMO_Object();
 
 $primary = $amo->getAddons(array(3615));
-$primary = $primary[0];
+if (is_array($primary) && !is_empty($primary)) {
+    $primary = $primary[0];
+}
 
 $other = $amo->getAddons(array(2410, 1833));
 
diff --git a/mozilla/webtools/addons/shared/lib/amo.class.php b/mozilla/webtools/addons/shared/lib/amo.class.php
index 7adf09dc0e4..30c94140b98 100644
--- a/mozilla/webtools/addons/shared/lib/amo.class.php
+++ b/mozilla/webtools/addons/shared/lib/amo.class.php
@@ -576,7 +576,8 @@ class AMO_Object
              INNER JOIN reviews r ON m.ID = r.ID
              INNER JOIN previews p ON p.ID = m.ID
              WHERE
-                 m.ID in ({$ids_sql})
+                 m.ID in ({$ids_sql}) AND
+                 p.preview = 'YES'
              GROUP BY
                  m.ID
          ";