bug 497282, show private add-ons in mine and favorites

git-svn-id: http://svn.mozilla.org/addons/trunk@27487 4eb1ac78-321c-0410-a911-ec516a8615a5

2 files changed, 5 insertions, 4 deletions

diff --git a/site/app/controllers/collections_controller.php b/site/app/controllers/collections_controller.php
index 3c77e2f..e9b7bfd 100644
--- a/site/app/controllers/collections_controller.php
+++ b/site/app/controllers/collections_controller.php
@@ -119,7 +119,8 @@ class CollectionsController extends AppController
 
     function editors_picks() {
         $this->set('selected', 'editors_picks');
-        $conditions = array('Collection.collection_type' => Collection::COLLECTION_TYPE_EDITORSPICK);
+        $conditions = array('Collection.collection_type' => Collection::COLLECTION_TYPE_EDITORSPICK,
+                            'Collection.listed' => 1);
         $this->Collection->unbindFully();
         $collections = $this->Collection->findAll($conditions, 'Collection.id');
         $this->_listing($collections);
@@ -128,7 +129,8 @@ class CollectionsController extends AppController
     function popular() {
         $this->set('selected', 'popular');
         $this->Collection->unbindFully();
-        $collections = $this->Collection->findAll(null, 'Collection.id');
+        $collections = $this->Collection->findAll(array('Collection.listed' => 1),
+                                                  'Collection.id');
         $pagination = array('sortBy' => 'subscribers DESC');
         $this->_listing($collections, $pagination);
     }
diff --git a/site/app/controllers/components/collections_listing.php b/site/app/controllers/components/collections_listing.php
index 75c68a3..e56d151 100644
--- a/site/app/controllers/components/collections_listing.php
+++ b/site/app/controllers/components/collections_listing.php
@@ -84,8 +84,7 @@ class CollectionsListingComponent extends Object {
      * @return array Collections query result
      */
     function fetchPage($ids, $pagination_options=array()) {
-        $conditions = array('Collection.listed' => '1',
-                            'Collection.id' => $ids);
+        $conditions = array('Collection.id' => $ids);
 
         list($sort_opts, $sortby) = $this->sorting();