diff --git a/ChangeLog b/ChangeLog
index 94fab797e..c2b78520a 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,11 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2004-05-19 Marc Delisle  <lem9@users.sourceforge.net>
+    * tbl_select.php: bug 956137, undefined $data: on the search page,
+      PMA_foreignDropdown() must be called with no current value for
+      the data
+
 2004-05-14 Michal Čihař  <michal@cihar.com>
     * libraries/auth/cookie.auth.lib.php: Show login form in top frame.
 
diff --git a/tbl_select.php b/tbl_select.php
index 8d15a9d28..1a8ae35e3 100644
--- a/tbl_select.php
+++ b/tbl_select.php
@@ -207,7 +207,11 @@ function PMA_tbl_select_operator(f, index, multiple) {
             // f o r e i g n    k e y s
             echo '                    <select name="fields[' . $i . ']">' . "\n";
             // go back to first row
-            echo PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, $data, 100);
+
+            // here, the 4th parameter is empty because there is no current
+            // value of data for the dropdown (the search page initial values
+            // are displayed empty)
+            echo PMA_foreignDropdown($disp_row, $foreign_field, $foreign_display, '', 100);
             echo '                    </select>' . "\n";
         } else if (isset($foreign_link) && $foreign_link == true) {
         ?>