Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-09-25 20:17:51 +02:00
commit 611add5b93

View File

@ -3357,7 +3357,7 @@ function PMA_getUserSpecificRights($username, $hostname, $type, $dbname = '')
/**
* Parses Proc_priv data
*
* @param string $prins Proc_priv
* @param string $privs Proc_priv
*
* @return array
*/
@ -4343,7 +4343,6 @@ function PMA_addUser(
$_REQUEST['old_usergroup'] ? $_REQUEST['old_usergroup'] : null;
PMA_setUserGroup($_REQUEST['username'], $old_usergroup);
if (isset($create_user_real)) {
$queries[] = $create_user_real;
}