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

Incorrect resolution of merge conflict was causing the database name to not show up on the serverinfo div. Fixed it

Browse Source
This commit is contained in:
ninadsp
2010-08-26 20:19:51 +05:30
parent bbb94f628f
commit 43c18c50b8
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/header.inc.php
View File

@@ -105,7 +105,7 @@ if (!$GLOBALS['is_ajax_request']) {
printf($item, printf($item,
$GLOBALS['cfg']['DefaultTabDatabase'], $GLOBALS['cfg']['DefaultTabDatabase'],
PMA_generate_common_url($GLOBALS['db']), PMA_generate_common_url($GLOBALS['db']),
__('New table'), $GLOBALS['db'],
'', '',
's_tbl.png'); 's_tbl.png');
// if the table is being dropped, $_REQUEST['purge'] is set // if the table is being dropped, $_REQUEST['purge'] is set