Merge remote-tracking branch 'origin/master'

libraries/classes/Server/Privileges.php

@@ -3140,7 +3140,7 @@ class Privileges
                 )
             )
             . '">'
-            . htmlspecialchars($dbname) . ': '
+            . htmlspecialchars(Util::unescapeMysqlWildcards($dbname)) . ': '
             . Util::getTitleForTarget(
                 $GLOBALS['cfg']['DefaultTabDatabase']
             )
@@ -4762,7 +4762,7 @@ class Privileges
      *
      * @return string $html_output
      */
-    public static function getHtmlForUserProperties($dbname_is_wildcard,$url_dbname,
+    public static function getHtmlForUserProperties($dbname_is_wildcard, $url_dbname,
         $username, $hostname, $dbname, $tablename
     ) {
         $html_output  = '<div id="edit_user_dialog">';

server_privileges.php

@@ -422,7 +422,7 @@ if (isset($_REQUEST['adduser'])) {
             str_replace(
                 array('\_', '\%'),
                 array('_', '%'),
-                $_REQUEST['dbname']
+                $dbname
             )
         );
     }