diff --git a/ChangeLog b/ChangeLog index 224ab87f0..3c651f29c 100755 --- a/ChangeLog +++ b/ChangeLog @@ -5,6 +5,10 @@ phpMyAdmin - Changelog $Id$ $Source$ +2005-08-08 Michal Čihař + * libraries/export/htmlword.php: Fix undefined variable when exporting + relations (bug #1253457). + 2005-08-08 Marc Delisle * libraries/dbi/mysqli.dbi.lib.php: bug #1253453, using mysqli extension with MySQL 4.0.x diff --git a/libraries/export/htmlword.php b/libraries/export/htmlword.php index 6c847dd5f..a78dd517e 100644 --- a/libraries/export/htmlword.php +++ b/libraries/export/htmlword.php @@ -280,6 +280,8 @@ function PMA_exportStructure($db, $table, $crlf, $error_url, $do_relation = fals $schema_insert .= '' . htmlspecialchars($row['Null'] == '' ? $GLOBALS['strNo'] : $GLOBALS['strYes']) . ''; $schema_insert .= '' . htmlspecialchars(isset($row['Default']) ? $row['Default'] : '') . ''; + $field_name = $row['Field']; + if ($do_relation && $have_rel) { $schema_insert .= '' . (isset($res_rel[$field_name]) ? htmlspecialchars($res_rel[$field_name]['foreign_table'] . ' (' . $res_rel[$field_name]['foreign_field'] . ')') : '') . ''; }