undefined index tbl_is_view

2 files changed, 6 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 8ad41c6014..861a599b93 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2005-03-22 Marc Delisle  <lem9@users.sourceforge.net>
+    * header.inc.php: undefined index tbl_is_view when copying a table
+      with constraints and an error occurs
+
 2005-03-20 Marc Delisle  <lem9@users.sourceforge.net>
     * lang/spanish: Updated, thanks to Daniel Hinostroza (hinostroza).
     * tbl_properties.inc.php: do not add ON UPDATE CURRENT_TIMESTAMP twice
diff --git a/header.inc.php b/header.inc.php
index 638ed1f49f..9a6565b087 100644
--- a/header.inc.php
+++ b/header.inc.php
@@ -199,10 +199,10 @@ if (empty($GLOBALS['is_header_sent'])) {
                 }
                 echo '        '
                    . '<td class="serverinfo"><div></div></td>' . "\n" . '            '
-                   . '<td class="serverinfo">' . ($GLOBALS['tbl_is_view'] ? $GLOBALS['strView'] : $GLOBALS['strTable']) . ':&nbsp;'
+                   . '<td class="serverinfo">' . (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? $GLOBALS['strView'] : $GLOBALS['strTable']) . ':&nbsp;'
                    . '<a href="' . $GLOBALS['cfg']['DefaultTabTable'] . '?' . PMA_generate_common_url($GLOBALS['db'], $GLOBALS['table']) . '">';
                 if ($GLOBALS['cfg']['MainPageIconic']) {
-                    echo '<img src="' . $GLOBALS['pmaThemeImage'] . ($GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png" width="16" height="16" border="0" alt="' . htmlspecialchars($GLOBALS['table']) . '" />';
+                    echo '<img src="' . $GLOBALS['pmaThemeImage'] . (isset($GLOBALS['tbl_is_view']) && $GLOBALS['tbl_is_view'] ? 'b_views' : 's_tbl') . '.png" width="16" height="16" border="0" alt="' . htmlspecialchars($GLOBALS['table']) . '" />';
                 }
                 echo htmlspecialchars($GLOBALS['table']) . '</a>' . "\n"
                    . '</td>' . "\n\n";