Merge branch 'QA_4_2'

2014-05-31 11:42:03 -04:00 · 2014-05-31 11:42:03 -04:00 · a2c3db5fa9
commit a2c3db5fa9
parent 61e79cad44 e5367c1c40
2 changed files with 3 additions and 1 deletions
--- a/1
+++ b/1
@ -18,6 +18,7 @@ phpMyAdmin - ChangeLog
 - bug #4432 Error while displaying chart at server level
 - bug #4405 Cannot import (open_basedir)
 - bug #4396 Problem copying constraints (such as Sakila)
+- bug #4433 Missing privileges submenu

 4.2.2.0 (2014-05-20)
 - bug #4388 Disable database expansion when enabled throws Error 500 when database name is clicked in navigation tree
--- a/libraries/server_privileges.lib.php
+++ b/libraries/server_privileges.lib.php
@ -3803,7 +3803,8 @@ function PMA_getHtmlHeaderForUserProperties(
       . __('User');

    if (! empty($dbname)) {
-        $html_output .= ' <i><a href="server_privileges.php'
+        $html_output .= ' <i><a class="edit_user_anchor ajax"'
+            . ' href="server_privileges.php'
            . PMA_URL_getCommon(
                array(
                    'username' => $username,