From: Andrew Dolgov <fox@madoka.volgo-balt.ru>
Date: Thu, 1 Nov 2012 16:14:22 +0000 (+0400)
Subject: simplify search dialog
X-Git-Tag: 1.6.1~17
X-Git-Url: https://git.wh0rd.org/?a=commitdiff_plain;h=a8c180251205c7d36901dbb17897771515e84f29;p=tt-rss.git

simplify search dialog
---

diff --git a/classes/dlg.php b/classes/dlg.php
index 71e80105..6c649539 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 99d8efc7..7e95be06 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);