Merge remote branch 'adriane/issues/misc-fixes' into develop-next

include/class.search.php

@@ -788,7 +788,7 @@ class SavedQueue extends CustomQueue {
     }
 
     function getStandardColumns() {
-        return parent::getColumns(($this->parent));
+        return parent::getColumns(is_null($this->parent));
     }
 
     function getColumns($use_template=false) {

include/staff/templates/queue-savedsearches-nav.tmpl.php

@@ -18,7 +18,6 @@
       <!-- Start Dropdown and child queues -->
       <?php foreach ($searches->findAll(array(
             'staff_id' => $thisstaff->getId(),
-            'parent_id' => 0,
             Q::not(array(
                 'flags__hasbit' => CustomQueue::FLAG_PUBLIC
             ))