Merge branch 'QA_4_7'

ChangeLog

@@ -68,6 +68,7 @@ phpMyAdmin - ChangeLog
 - issue #12990 Fixed error when loading favorite tables to console
 - issue #12981 Improved rendering of new version information
 - issue #12922 Fixed bookmarks ordering
+- issue #12964 Fixed table search in navigation
 
 4.6.6 (2017-01-23)
 - issue #12759 Fix Notice regarding 'Undefined index: old_usergroup'

libraries/URL.php

@@ -63,8 +63,6 @@ class URL
             $params['collation_connection'] = $GLOBALS['collation_connection'];
         }
 
-        $params['token'] = $_SESSION[' PMA_token '];
-
         if (! is_array($skip)) {
             if (isset($params[$skip])) {
                 unset($params[$skip]);
@@ -114,6 +112,9 @@ class URL
     {
         $fields = '';
 
+        /* Always include token */
+        $values['token'] = $_SESSION[' PMA_token '];
+
         foreach ($values as $name => $value) {
             if (! empty($pre)) {
                 $name = $pre . '[' . $name . ']';