diff --git a/ChangeLog b/ChangeLog
index a88c42f13..86c29b0bc 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,9 +5,13 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2002-03-03 Loïc Chapeaux  <lolo@phpheaven.net>
+	* libraries/display_tbl.lib.php3, line 1306: fixed a bug reported by Marc
+	  Delisle with the relation feature.
+
 2002-03-04 Marc Delisle  <lem9@users.sourceforge.net>
-	* user_details.php3: default value for wildcard db name
-	* lang/*.php3, $strDatabaseWildcard
+	* user_details.php3: default value for wildcard db name.
+	* lang/*.php3, $strDatabaseWildcard.
 
 2002-03-03 Loïc Chapeaux  <lolo@phpheaven.net>
 	* libraries/display_tbl.lib.php3:
diff --git a/libraries/display_tbl.lib.php3 b/libraries/display_tbl.lib.php3
index 3016bc096..91972cf61 100644
--- a/libraries/display_tbl.lib.php3
+++ b/libraries/display_tbl.lib.php3
@@ -1303,7 +1303,7 @@ if (!defined('PMA_DISPLAY_TBL_LIB_INCLUDED')){
 //            $tabs = '(\'' . join('\',\'', spliti('`? *((on [^,]+)?,|(NATURAL )?(inner|left|right)( outer)? join) *`?',
 //                    eregi_replace('^.*FROM +`?|`? *(on [^,]+)?(WHERE.*)?$', '', $sql_query))) . '\')';
             $pattern = '`?[[:space:]]+(((ON|on)[[:space:]]+[^,]+)?,|((NATURAL|natural)[[:space:]]+)?(INNER|inner|LEFT|left|RIGHT|right)([[:space:]]+(OUTER|outer))?[[:space:]]+(JOIN|join))[[:space:]]*`?';
-            $target  = eregi_replace('^.*[[:space:]]+FROM[[:space:]]+`?|`?[[:space:]]+(ON[[:space:]]+[^,]+)?(WHERE[[:space:]]+.*)?$', '', $sql_query);
+            $target  = eregi_replace('^.*[[:space:]]+FROM[[:space:]]+`?|`?[[:space:]]*(ON[[:space:]]+[^,]+)?(WHERE[[:space:]]+.*)?$', '', $sql_query);
             $tabs    = '(\'' . join('\',\'', split($pattern, $target)) . '\')';
 
             $local_query = 'SELECT src_column, dest_table, dest_column'