From 9a620adcea474728832c0d5026c8dfc08d065092 Mon Sep 17 00:00:00 2001
From: Marc Delisle <marc@infomarc.info>
Date: Mon, 31 May 2004 18:53:05 +0000
Subject: [PATCH] bug 963414 when PropertiesIconic is FALSE, and use strServer

---
 ChangeLog      |  5 +++++
 header.inc.php | 12 ++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f6165ac69..99950353f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-05-31 Marc Delisle  <lem9@users.sourceforge.net>
+    * header.inc.php: bug #963414, when PropertiesIconic was false,
+      the code did not define the icon variables. Also, remove hardcoded
+      'Server' string
+
 2004-05-30 Michal Čihař  <michal@cihar.com>
     * libraries/display_tbl.lib.php: Return back to browsing after editing
       row.
diff --git a/header.inc.php b/header.inc.php
index 78d742e8f..28b5f0c37 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -185,14 +185,18 @@ if (empty($GLOBALS['is_header_sent'])) {
                        );
         if (isset($GLOBALS['db'])) {
             if ($cfg['PropertiesIconic']){
-              $host_icon_img='<img src="./images/s_host.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+                $host_icon_img='<img src="./images/s_host.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+            } else {
+                $host_icon_img = '';
             }
-            echo '<td nowrap="nowrap">Server:&nbsp;</td>'
+            echo '<td nowrap="nowrap">' . sprintf($GLOBALS['strServer'],'') . ':&nbsp;</td>'
                . '<td nowrap="nowrap"><b>'
                . '<a href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">' . $host_icon_img . htmlspecialchars($server_info) . '</a>'
                . '</b></td>';
             if ($cfg['PropertiesIconic']){
               $db_icon_img='<img src="./images/s_db.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+            } else {
+              $db_icon_img = '';
             }
             echo '<td nowrap="nowrap">&nbsp;&nbsp;&gt;&nbsp;&nbsp;</td>';
             echo '<td nowrap="nowrap">' . $GLOBALS['strDatabase'] . ':&nbsp;</td>'
@@ -203,6 +207,8 @@ if (empty($GLOBALS['is_header_sent'])) {
             if (!empty($GLOBALS['table'])) {
               if ($cfg['PropertiesIconic']){
                 $tbl_icon_img='<img src="./images/s_tbl.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+              } else {
+                $tbl_icon_img = '';
               }
               echo '<td nowrap="nowrap">&nbsp;&nbsp;&gt;&nbsp;&nbsp;</td>';
               echo '<td nowrap="nowrap">' . $GLOBALS['strTable'] . ':&nbsp;</td>'
@@ -215,6 +221,8 @@ if (empty($GLOBALS['is_header_sent'])) {
         } else {
            if ($cfg['PropertiesIconic']){
              $host_icon_img='<img src="./images/s_host.png" width="16" height="16" border="0" hspace="2" align="absmiddle" />';
+            } else {
+                $host_icon_img = '';
             }
             echo '<tr><td nowrap="nowrap">Server:&nbsp;</td>'
                . '<td nowrap="nowrap"><b><a href="' . $GLOBALS['cfg']['DefaultTabServer'] . $header_url_qry . '">'