Remove fulltext search without index

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@929 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/adminer.inc.php b/adminer/include/adminer.inc.php
index a7c56d45965d4c0b28a3decd226cc06018e4c206..b43b8595b02049f36fefbfaf15970aad5325ce7c 100644 (file)
--- a/adminer/include/adminer.inc.php
+++ b/adminer/include/adminer.inc.php
@@ -276,23 +276,19 @@ class Adminer {
                }
                foreach ((array) $_GET["where"] as $val) {
                        if (strlen("$val[col]$val[val]") && in_array($val["op"], $this->operators)) {
-                               if ($val["op"] == "AGAINST") {
-                                       $return[] = "MATCH (" . idf_escape($val["col"]) . ") AGAINST (" . $dbh->quote($val["val"]) . " IN BOOLEAN MODE)";
+                               $in = process_length($val["val"]);
+                               $cond = " $val[op]" . (ereg('NULL$', $val["op"]) ? "" : (ereg('IN$', $val["op"]) ? " (" . (strlen($in) ? $in : "NULL") . ")" : " " . $this->processInput($fields[$val["col"]], $val["val"])));
+                               if (strlen($val["col"])) {
+                                       $return[] = idf_escape($val["col"]) . $cond;
                                } else {
-                                       $in = process_length($val["val"]);
-                                       $cond = " $val[op]" . (ereg('NULL$', $val["op"]) ? "" : (ereg('IN$', $val["op"]) ? " (" . (strlen($in) ? $in : "NULL") . ")" : " " . $this->processInput($fields[$val["col"]], $val["val"])));
-                                       if (strlen($val["col"])) {
-                                               $return[] = idf_escape($val["col"]) . $cond;
-                                       } else {
-                                               // find anywhere
-                                               $cols = array();
-                                               foreach ($fields as $name => $field) {
-                                                       if (is_numeric($val["val"]) || !ereg('int|float|double|decimal', $field["type"])) {
-                                                               $cols[] = $name;
-                                                       }
+                                       // find anywhere
+                                       $cols = array();
+                                       foreach ($fields as $name => $field) {
+                                               if (is_numeric($val["val"]) || !ereg('int|float|double|decimal', $field["type"])) {
+                                                       $cols[] = $name;
                                                }
-                                               $return[] = ($cols ? "(" . implode("$cond OR ", array_map('idf_escape', $cols)) . "$cond)" : "0");
                                        }
+                                       $return[] = ($cols ? "(" . implode("$cond OR ", array_map('idf_escape', $cols)) . "$cond)" : "0");
                                }
                        }
                }