diff options
Diffstat (limited to 'classes')
-rw-r--r-- | classes/dlg.php | 24 | ||||
-rw-r--r-- | classes/feeds.php | 6 |
2 files changed, 4 insertions, 26 deletions
diff --git a/classes/dlg.php b/classes/dlg.php index 71e801059..6c649539f 100644 --- 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 99d8efc7b..7e95be06f 100644 --- a/classes/feeds.php +++ b/classes/feeds.php @@ -215,11 +215,7 @@ class Feeds extends Handler_Protected { }
@$search_mode = db_escape_string($_REQUEST["search_mode"]);
- @$match_on = db_escape_string($_REQUEST["match_on"]);
-
- if (!$match_on) {
- $match_on = "both";
- }
+ $match_on = "both"; // deprecated, TODO: remove
if ($_REQUEST["debug"]) $timing_info = print_checkpoint("H0", $timing_info);
|