simplify search dialog

diff --git a/classes/dlg.php b/classes/dlg.php
index 71e801059e579f9c9dd7a96f280ddf4d8b39c508..6c649539fcfb9f6a3f808f074ac98ec8f72248b9 100644 (file)
--- a/classes/dlg.php
+++ b/classes/dlg.php
@@ -375,27 +375,9 @@ class Dlg extends Handler_Protected {
 
                print "<div class=\"dlgSecCont\">";
 
-               if (!SPHINX_ENABLED) {
-
-                       print "<input dojoType=\"dijit.form.ValidationTextBox\"
-                               style=\"font-size : 16px; width : 12em;\"
-                               required=\"1\" name=\"query\" type=\"search\" value=''>";
-
-                       print " " . __('match on')." ";
-
-                       $search_fields = array(
-                               "title" => __("Title"),
-                                       "content" => __("Content"),
-                               "both" => __("Title or content"));
-
-                       print_select_hash("match_on", 3, $search_fields,
-                               'dojoType="dijit.form.Select"');
-               } else {
-                       print "<input dojoType=\"dijit.form.ValidationTextBox\"
-                               style=\"font-size : 16px; width : 20em;\"
-                               required=\"1\" name=\"query\" type=\"search\" value=''>";
-               }
-
+               print "<input dojoType=\"dijit.form.ValidationTextBox\"
+                       style=\"font-size : 16px; width : 20em;\"
+                       required=\"1\" name=\"query\" type=\"search\" value=''>";
 
                print "<hr/>".__('Limit search to:')." ";
 

diff --git a/classes/feeds.php b/classes/feeds.php
index 99d8efc7b6c52a14fb1b31c42f6fa0f26d1ad0cf..7e95be06f51826bb445813aff057dccfe1d928f5 100644 (file)
--- a/classes/feeds.php
+++ b/classes/feeds.php
@@ -215,11 +215,7 @@ class Feeds extends Handler_Protected {
                }\r
 \r
                @$search_mode = db_escape_string($_REQUEST["search_mode"]);\r
-               @$match_on = db_escape_string($_REQUEST["match_on"]);\r
-\r
-               if (!$match_on) {\r
-                       $match_on = "both";\r
-               }\r
+               $match_on = "both"; // deprecated, TODO: remove\r
 \r
                if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);\r
 \r