Ticket #130: searchfolders.patch

cls/search.php

@@ -159 +159 @@
         
                 
                 if ($this->channelId != ALL_CHANNELS_ID) {
-                        $qWhere .= " and c.id = " . $this->channelId  . " ";
+                        $qWhere .= " and ( c.id = " . $this->channelId  . " or c.parent = " . $this->channelId . " ) ";
                 }
         
                 if (hidePrivate()) {

cls/wrappers/searchform.php

@@ -93 +93 @@
                                 $parent_ = LBL_HOME_FOLDER;
                         }
                         $ret .= "\t\t\t<optgroup label=\"$parent_ /\">\n";
+                        $ret .= "\t\t\t\t<option value=\"$parent_id_\"". 
+                        ((array_key_exists(QUERY_CHANNEL, $_REQUEST) && $_REQUEST[QUERY_CHANNEL] == $parent_id_) ? 
+                        " selected=\"selected\"" : "").">* All $parent_ feeds *</option>\n";
+
                         $prev_parent = $parent_id_;
                 }