gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2013-02-04 08:08:57 +01:00
commit 4958bc27f8
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/server_privileges.lib.php
View File

@ -3224,11 +3224,12 @@ function PMA_getDbSpecificPrivsQueriesForChangeOrCopyUser(
* @param string $sql_query SQL query to be displayed
* @param string $username username
* @param string $hostname host name
* @param string $dbname database name
*
* @return array $sql_query, $message
*/
function PMA_addUserAndCreateDatabase($_error, $real_sql_query, $sql_query,
$username, $hostname
$username, $hostname, $dbname
) {
if ($_error || ! PMA_DBI_try_query($real_sql_query)) {
$_REQUEST['createdb-1'] = $_REQUEST['createdb-2']
@ -3346,8 +3347,8 @@ function PMA_getSqlQueriesForDisplayAndAddUser($username, $hostname, $password)
|| isset($_POST['max_updates']) || isset($_POST['max_user_connections']))
) {
$with_clause = PMA_getWithClauseForAddUserAndUpdatePrivs();
$real_sql_query .= $with_clause;
$sql_query .= $with_clause;
$real_sql_query .= ' ' . $with_clause;
$sql_query .= ' ' . $with_clause;
}
if (isset($create_user_real)) {

2
server_privileges.php
View File

@ -228,7 +228,7 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
$sql_query = $create_user_show . $sql_query;
}
list($sql_query, $message) = PMA_addUserAndCreateDatabase(
$_error, $real_sql_query, $sql_query, $username, $hostname
$_error, $real_sql_query, $sql_query, $username, $hostname, $dbname
);
} else {