diff --git a/ChangeLog b/ChangeLog
index f30fe9417..920de6917 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,9 @@ phpMyAdmin - Changelog
 $Id$
 $Source$
 
+2003-08-27 Alexander M. Turek  <rabus@users.sourceforge.net>
+    * browse_foreigners.php3: undefined variable.
+
 2003-08-26 Alexander M. Turek  <rabus@users.sourceforge.net>
     * libraries/common.lib.php3: Backwards compatibility.
     * tbl_change.php3: bug #795171 (foreign field empty when editing record).
diff --git a/browse_foreigners.php3 b/browse_foreigners.php3
index 5a0362c05..b84169491 100644
--- a/browse_foreigners.php3
+++ b/browse_foreigners.php3
@@ -104,7 +104,7 @@ if ($the_total > $per_page) {
         $firstPage = ($pageNow - $range < 1 ? 1 : $pageNow - $range);
         $lastPage  = ($pageNow + $range > $nbTotalPage ? $nbTotalPage : $pageNow + $range);
     }
-    
+
     for ($i=$firstPage; $i<=$lastPage; $i++){
         if ($i == $pageNow) {
             $selected = 'selected="selected"';
@@ -144,20 +144,22 @@ if (isset($disp) && $disp) {
             $vtitle = htmlspecialchars($relrow[$foreign_display]);
             $value  = (($foreign_display != FALSE) ? htmlspecialchars(substr($vtitle, 0, $cfg['LimitChars']) . '...') : '');
         }
-        
+
         if ($count > $cfg['RepeatCells']) {
             echo $header;
             $count = -1;
         }
+        $key_equals_data = isset($data) && $key == $data;
 ?>
     <tr>
-        <td nowrap="nowrap" bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key == $data ? '<b>' : '') . '<a href="#" title="' . $strUseThisValue . ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . htmlspecialchars($key) . '</a>' . ($key == $data ? '</b>' : ''); ?></td>
-        <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key == $data ? '<b>' : '') .                 '<a href="#" title="' . $strUseThisValue . ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . $value . '</a>' . ($key == $data ? '</b>' : ''); ?></td>
+        <td nowrap="nowrap" bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key_equals_data ? '<b>' : '') . '<a href="#" title="' . $strUseThisValue . ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . htmlspecialchars($key) . '</a>' . ($key_equals_data ? '</b>' : ''); ?></td>
+        <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key_equals_data ? '<b>' : '') .                 '<a href="#" title="' . $strUseThisValue . ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . $value . '</a>' . ($key_equals_data ? '</b>' : ''); ?></td>
         <td width="20%"><img src="images/spacer.gif" alt="" width="1" height="1"></td>
-        <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key == $data ? '<b>' : '') .                 '<a href="#" title="' . $strUseThisValue .  ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . $value . '</a>' . ($key == $data ? '</b>' : ''); ?></td>
-        <td nowrap="nowrap" bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key == $data ? '<b>' : '') . '<a href="#" title="' . $strUseThisValue .  ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . htmlspecialchars($key) . '</a>' . ($key == $data ? '</b>' : ''); ?></td>
+        <td bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key_equals_data ? '<b>' : '') .                 '<a href="#" title="' . $strUseThisValue .  ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . $value . '</a>' . ($key_equals_data ? '</b>' : ''); ?></td>
+        <td nowrap="nowrap" bgcolor="<?php echo $bgcolor; ?>"><?php echo ($key_equals_data ? '<b>' : '') . '<a href="#" title="' . $strUseThisValue .  ($vtitle != '' ? ': ' . $vtitle : '') . '" onclick="formupdate(\'' . md5($field) . '\', \'' . htmlspecialchars($key) . '\'); return false;">' . htmlspecialchars($key) . '</a>' . ($key_equals_data ? '</b>' : ''); ?></td>
     </tr>
 <?php
+        unset($key_equals_data);
     } // end while
 }