From 20a5e25fe0e4657c19c092209012d186b33c9d10 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 25 Jan 2017 10:01:16 +0100
Subject: [PATCH 1/2] Fix navigation panel server side search
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #12923

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 libraries/navigation/nodes/Node.php | 20 +++++---------------
 1 file changed, 5 insertions(+), 15 deletions(-)

diff --git a/libraries/navigation/nodes/Node.php b/libraries/navigation/nodes/Node.php
index c5ee89d9d8..f265fca288 100644
--- a/libraries/navigation/nodes/Node.php
+++ b/libraries/navigation/nodes/Node.php
@@ -424,9 +424,7 @@ class Node
             return $retval;
         }
 
-        $dbSeparator = $GLOBALS['dbi']->escapeString(
-            $GLOBALS['cfg']['NavigationTreeDbSeparator']
-        );
+        $dbSeparator = $GLOBALS['cfg']['NavigationTreeDbSeparator'];
         if (isset($GLOBALS['cfg']['Server']['DisableIS'])
             && !$GLOBALS['cfg']['Server']['DisableIS']
         ) {
@@ -436,7 +434,7 @@ class Node
             $query .= "SELECT DB_first_level ";
             $query .= "FROM ( ";
             $query .= "SELECT DISTINCT SUBSTRING_INDEX(SCHEMA_NAME, ";
-            $query .= "'%s', 1) ";
+            $query .= "'" . $GLOBALS['dbi']->escapeString($dbSeparator) . "', 1) ";
             $query .= "DB_first_level ";
             $query .= "FROM INFORMATION_SCHEMA.SCHEMATA ";
             $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
@@ -446,19 +444,11 @@ class Node
             $query .= ") t2 ";
             $query .= $this->_getWhereClause('SCHEMA_NAME', $searchClause);
             $query .= "AND 1 = LOCATE(CONCAT(DB_first_level, ";
-            $query .= "'%s'), ";
+            $query .= "'" . $GLOBALS['dbi']->escapeString($dbSeparator) . "'), ";
             $query .= "CONCAT(SCHEMA_NAME, ";
-            $query .= "'%s')) ";
+            $query .= "'" . $GLOBALS['dbi']->escapeString($dbSeparator) . "')) ";
             $query .= "ORDER BY SCHEMA_NAME ASC";
-
-            $retval = $GLOBALS['dbi']->fetchResult(
-                sprintf(
-                    $query,
-                    $dbSeparator,
-                    $dbSeparator,
-                    $dbSeparator
-                )
-            );
+            $retval = $GLOBALS['dbi']->fetchResult($query);
 
             return $retval;
         }

From c18d2a9cedc2d08d27c2999ff7605574f1daefcf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Wed, 25 Jan 2017 10:03:08 +0100
Subject: [PATCH 2/2] Changelog entry for #12923
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ChangeLog b/ChangeLog
index 4f901128dd..ee97e37e59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -48,6 +48,7 @@ phpMyAdmin - ChangeLog
 - issue #12897 Use consistent numeric format for table overhead
 - issue #12901 Use server returned table name on renaming table
 - issue #12918 Always use \r\n as newline when editing fields
+- issue #12923 Fixed server side search in navigation panel
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'