Merge remote-tracking branch 'origin/master'

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

libraries/DbSearch.php

@@ -143,7 +143,7 @@ class DbSearch
             unset($this->_criteriaColumnName);
         } else {
             $this->_criteriaColumnName = $GLOBALS['dbi']->escapeString(
-                $_REQUEST['criteriaColumnName'], true
+                $_REQUEST['criteriaColumnName']
             );
         }
     }

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 .= "%' ";
         }