diff --git a/ChangeLog b/ChangeLog
index 982bdf076..ca932a34f 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-11-21 Marc Delisle  <lem9@users.sourceforge.net>
+    * libraries/display_tbl.lib.php3: undefined variable $display_field
+
 2002-11-21 Alexander M. Turek  <rabus@users.sourceforge.net>
     * lang/japanese-*.inc.php3: Updates.
 
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index def237170..0d6457968 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -6,7 +6,6 @@
  * Set of functions used to display the records returned by a sql query
  */
 
-
 if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
     define('PMA_DISPLAY_TBL_LIB_INCLUDED', 1);
 
@@ -1505,8 +1504,8 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')) {
                     // check for display field?
                     if ($cfgRelation['displaywork']) {
                         $display_field = PMA_getDisplayField($db, $rel[2]);
+                        $map[$rel[0]] = array($rel[2], $rel[3], $display_field);
                     } // end if
-                    $map[$rel[0]] = array($rel[2], $rel[3], $display_field);
                 } // end while
             } // end if
         } // end 2b