From e6f88fdcfc672ed98dedd88bc3ddf539e9ca1cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= <michal@cihar.com>
Date: Mon, 15 May 2017 10:25:58 +0200
Subject: [PATCH] Fix link to User accounts overview page
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Fixes #13266

Signed-off-by: Michal Čihař <michal@cihar.com>
---
 ChangeLog                      |  1 +
 libraries/server_users.lib.php | 10 +++-------
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 825b2d505f..b7b9daec58 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ phpMyAdmin - ChangeLog
 - issue #13252 Fixed grid editing time column
 - issue #13258 Fixed detection of Amazon RDS
 - issue #13241 Redirect user to last page that has any tables to display
+- issue #13266 Fix link to User accounts overview page
 
 4.7.0 (2017-03-28)
 - patch #12233 [Display] Improve message when renaming database to same name
diff --git a/libraries/server_users.lib.php b/libraries/server_users.lib.php
index bbf0a623c2..c4e5c21c44 100644
--- a/libraries/server_users.lib.php
+++ b/libraries/server_users.lib.php
@@ -16,20 +16,17 @@ use PMA\libraries\URL;
  */
 function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
 {
-    $url_params = URL::getCommon();
     $items = array(
         array(
             'name' => __('User accounts overview'),
-            'url' => 'server_privileges.php',
-            'specific_params' => '&viewing_mode=server'
+            'url' => 'server_privileges.php' . URL::getCommon(array('viewing_mode' => 'server')),
         )
     );
 
     if ($GLOBALS['is_superuser']) {
         $items[] = array(
             'name' => __('User groups'),
-            'url' => 'server_user_groups.php',
-            'specific_params' => ''
+            'url' => 'server_user_groups.php' . URL::getCommon(),
         );
     }
 
@@ -41,8 +38,7 @@ function PMA_getHtmlForSubMenusOnUsersPage($selfUrl)
         }
         $retval .= '<li>';
         $retval .= '<a' . $class;
-        $retval .= ' href="' . $item['url']
-            . $url_params . $item['specific_params'] . '">';
+        $retval .= ' href="' . $item['url'] . '">';
         $retval .= $item['name'];
         $retval .= '</a>';
         $retval .= '</li>';