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

Resolved conflicts left over from previous merge

Browse Source
This commit is contained in:
ninadsp
2010-07-29 22:53:07 +05:30
parent cd42d616f7
commit e8e87ae675
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server_privileges.php
View File

@@ -974,18 +974,14 @@ if (isset($_REQUEST['adduser_submit']) || isset($_REQUEST['change_copy'])) {
$message = PMA_Message::rawError(PMA_DBI_getError()); $message = PMA_Message::rawError(PMA_DBI_getError());
break; break;
} }
<<<<<<< HEAD
if($GLOBALS['is_ajax_request'] != true) { if($GLOBALS['is_ajax_request'] != true) {
// this is needed in case tracking is on:
$GLOBALS['db'] = $username;
$GLOBALS['reload'] = TRUE; $GLOBALS['reload'] = TRUE;
PMA_reloadNavigation(); 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 ' $q = 'GRANT ALL PRIVILEGES ON '
. PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO \'' . PMA_backquote(PMA_sqlAddslashes($username)) . '.* TO \''