From 43c18c50b83ed5ca5bf2e5c3ad9b4ecb3b80f0b6 Mon Sep 17 00:00:00 2001
From: ninadsp <ninadsp16289@gmail.com>
Date: Thu, 26 Aug 2010 20:19:51 +0530
Subject: [PATCH] Incorrect resolution of merge conflict was causing the
 database name to not show up on the serverinfo div.  Fixed it

---
 libraries/header.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/header.inc.php b/libraries/header.inc.php
index 60b164170..d5c64f38c 100755
--- a/libraries/header.inc.php
+++ b/libraries/header.inc.php
@@ -105,7 +105,7 @@ if (!$GLOBALS['is_ajax_request']) {
                 printf($item,
                         $GLOBALS['cfg']['DefaultTabDatabase'],
                         PMA_generate_common_url($GLOBALS['db']),
-                        __('New table'),
+                        $GLOBALS['db'],
                         '',
                         's_tbl.png');
                 // if the table is being dropped, $_REQUEST['purge'] is set