]> git.joonet.de Git - adminer.git/commitdiff
Use LIKE operator in Editor
authorjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Tue, 28 Jul 2009 09:27:00 +0000 (09:27 +0000)
committerjakubvrana <jakubvrana@7c3ca157-0c34-0410-bff1-cbf682f78f5c>
Tue, 28 Jul 2009 09:27:00 +0000 (09:27 +0000)
Typos

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

adminer/include/adminer.inc.php
editor/include/adminer.inc.php

index 65089a0e83f26e08d95ea41d2ee884cac7eac289..9db9808aa1718db05868c376c5ab16dec21957a6 100644 (file)
@@ -127,7 +127,7 @@ class Adminer {
        /** Value conversion used in select and edit
        * @param string
        * @param array single field returned from fields()
-       * @return 
+       * @return string
        */
        function editVal($val, $field) {
                return $val;
index 59bc8eea2e471f3d06a8daf61d8449a31930ec3f..a8432306f9a6ab1f39a24fa2c808531e0af9575d 100644 (file)
@@ -188,7 +188,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
                foreach ((array) $_GET["where"] as $val) {
                        if (strlen("$val[col]$val[val]")) {
                                $value = $this->processInput($fields[$val["col"]], $val["val"]);
-                               $cond = ($value == "NULL" ? " IS $value" : " = $value");
+                               $cond = ($value == "NULL" ? " IS" : ($val["op"] == "=" ? " =" : " LIKE")) . " $value";
                                if (strlen($val["col"])) {
                                        $return[] = idf_escape($val["col"]) . $cond;
                                } else {
@@ -208,7 +208,7 @@ ORDER BY ORDINAL_POSITION"); //! requires MySQL 5
        
        function selectOrderProcess($columns, $select, $indexes) {
                return ($_GET["order"]
-                       ? idf_escape($_GET["order"][0]) . (isset($_GET["desc"][0]) ? " DESC" : "")
+                       ? array(idf_escape($_GET["order"][0]) . (isset($_GET["desc"][0]) ? " DESC" : ""))
                        : $indexes[$_GET["index_order"]]["columns"]
                );
        }