diff --git a/ChangeLog b/ChangeLog index ded973044e..5117ce1482 100644 --- a/ChangeLog +++ b/ChangeLog @@ -49,6 +49,7 @@ phpMyAdmin - ChangeLog - issue #12757 Fixed creating new user with older MariaDB - issue #12784 Remove ctype installation suggestion - issue #12780 Format button replaces all text with blank spaces +- issue #12786 Fixed database searching 4.6.5.2 (2016-12-05) - issue #12765 Fixed SQL export with newlines diff --git a/libraries/DbSearch.php b/libraries/DbSearch.php index 1caf9f6f39..a21da63825 100644 --- a/libraries/DbSearch.php +++ b/libraries/DbSearch.php @@ -143,7 +143,7 @@ class DbSearch unset($this->_criteriaColumnName); } else { $this->_criteriaColumnName = $GLOBALS['dbi']->escapeString( - $_REQUEST['criteriaColumnName'], true + $_REQUEST['criteriaColumnName'] ); } } diff --git a/libraries/navigation/nodes/Node.php b/libraries/navigation/nodes/Node.php index 8265f63192..f265fca288 100644 --- a/libraries/navigation/nodes/Node.php +++ b/libraries/navigation/nodes/Node.php @@ -685,7 +685,7 @@ class Node { if (!empty($searchClause)) { $databases = array( - "%" . $GLOBALS['dbi']->escapeString($searchClause, true) . "%", + "%" . $GLOBALS['dbi']->escapeString($searchClause) . "%", ); } elseif (!empty($GLOBALS['cfg']['Server']['only_db'])) { $databases = $GLOBALS['cfg']['Server']['only_db']; @@ -712,10 +712,7 @@ class Node if (!empty($searchClause)) { $whereClause .= "AND " . Util::backquote($columnName) . " LIKE '%"; - $whereClause .= $GLOBALS['dbi']->escapeString( - $searchClause, - true - ); + $whereClause .= $GLOBALS['dbi']->escapeString($searchClause); $whereClause .= "%' "; }