Resolved conflicts left over from previous merge
This commit is contained in:
@@ -974,18 +974,14 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
|
||||
$message = PMA_Message::rawError(PMA_DBI_getError());
|
||||
break;
|
||||
}
|
||||
<<<<<<< HEAD
|
||||
|
||||
|
||||
if($GLOBALS['is_ajax_request'] != true) {
|
||||
// this is needed in case tracking is on:
|
||||
$GLOBALS['db'] = $username;
|
||||
$GLOBALS['reload'] = TRUE;
|
||||
PMA_reloadNavigation();
|
||||
}
|
||||
=======
|
||||
// this is needed in case tracking is on:
|
||||
$GLOBALS['db'] = $username;
|
||||
$GLOBALS['reload'] = TRUE;
|
||||
PMA_reloadNavigation();
|
||||
>>>>>>> origin/master
|
||||
|
||||
$q = 'GRANT ALL PRIVILEGES ON '
|
||||
. PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO \''
|
||||
|
Reference in New Issue
Block a user