diff --git a/ChangeLog b/ChangeLog
index ee330dc8b..53fd8c093 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -24,6 +24,7 @@ $Source$
       "mysql_results" and "mysql_fetch_array" on invalid queries.
     * db_details*.php3; mult_submits.inc.php3; sql.php3: splitted the large
       "database details" page in parts.
+    * tbl_properties_links.php3: optimized (less server work).
 
 2002-04-30 Loïc Chapeaux  <lolo@phpheaven.net>
     * lang/italian.inc.php3: updated thanks to Pietro Danesi.
diff --git a/tbl_properties_links.php3 b/tbl_properties_links.php3
index fbe743622..655e003bd 100755
--- a/tbl_properties_links.php3
+++ b/tbl_properties_links.php3
@@ -5,30 +5,24 @@
 /**
  * Prepares links
  */
-$lnk3        = '<a href="tbl_properties_export.php3?' . $url_query . '">';
-$lnk5        = '<a href="tbl_properties_operations.php3?' . $url_query . '">';
-$lnk6        = '<a href="tbl_properties_options.php3?' . $url_query . '">';
-$lnk7        = '<a href="tbl_properties_structure.php3?' . $url_query . '">';
-$lnk8        = '<a href="tbl_properties.php3?' . $url_query . '">';
-
 if ($num_rows > 0) {
-    $lnk1    = '<a href="sql.php3?' . $url_query
+    $lnk2    = '<a href="sql.php3?' . $url_query
              . '&amp;sql_query=' . urlencode('SELECT * FROM ' . PMA_backquote($table))
              . '&amp;pos=0">';
-    $lnk2    = '<a href="tbl_select.php3?' . $url_query . '">';
-    $ln4_stt = (PMA_MYSQL_INT_VERSION >= 40000)
+    $lnk4    = '<a href="tbl_select.php3?' . $url_query . '">';
+    $ln6_stt = (PMA_MYSQL_INT_VERSION >= 40000)
              ? 'TRUNCATE '
              : 'DELETE FROM ';
-    $lnk4    = '<a href="sql.php3?' . $url_query . '&amp;sql_query='
-             . urlencode($ln4_stt . PMA_backquote($table))
+    $lnk6    = '<a href="sql.php3?' . $url_query . '&amp;sql_query='
+             . urlencode($ln6_stt . PMA_backquote($table))
              .  '&amp;zero_rows='
              .  urlencode(sprintf($strTableHasBeenEmptied, htmlspecialchars($table)))
              .  '"' . "\n"
-             . '         onclick="return confirmLink(this, \'' . $ln4_stt . PMA_jsFormat($table) . '\')">';
+             . '         onclick="return confirmLink(this, \'' . $ln6_stt . PMA_jsFormat($table) . '\')">';
 } else {
-    $lnk1 = '';
     $lnk2 = '';
     $lnk4 = '';
+    $lnk6 = '';
 }
 
 
@@ -37,26 +31,30 @@ if ($num_rows > 0) {
  */
 ?>
 <p>
-    [ <?php echo $lnk8 . "\n"; ?>
-        <b><?php echo $strHome; ?></b><?php if ($lnk8) echo '</a>'; ?>&nbsp;|
-    <?php echo $lnk1 . "\n"; ?>
-        <b><?php echo $strBrowse; ?></b><?php if ($lnk1) echo '</a>'; ?>&nbsp;|
-    <?php echo $lnk7 . "\n"; ?>
-        <b><?php echo $strStructure; ?></b><?php if ($lnk7) echo '</a>'; ?>&nbsp;|
+    [&nbsp;
+    <a href="tbl_properties.php3?<?php echo $url_query; ?>">
+        <b><?php echo $strHome; ?></b></a>&nbsp;|
     <?php echo $lnk2 . "\n"; ?>
-        <b><?php echo $strSelect; ?></b><?php if ($lnk2) echo '</a>'; ?>&nbsp;|
+        <b><?php echo $strBrowse; ?></b><?php if ($lnk2) echo '</a>'; ?>&nbsp;|
+    <a href="tbl_properties_structure.php3?<?php echo $url_query; ?>">
+        <b><?php echo $strStructure; ?></b></a>&nbsp;|
+    <?php echo $lnk4 . "\n"; ?>
+        <b><?php echo $strSelect; ?></b><?php if ($lnk4) echo '</a>'; ?>&nbsp;|
     <a href="tbl_change.php3?<?php echo $url_query; ?>">
         <b><?php echo $strInsert; ?></b></a>&nbsp;|
-    <?php echo $lnk4 . "\n"; ?>
-         <b><?php echo $strEmpty; ?></b><?php if ($lnk4) echo '</a>'; ?>&nbsp;|
-    <?php echo $lnk3 . "\n"; ?>
-         <b><?php echo $strExport; ?></b><?php if ($lnk3) echo '</a>'; ?>&nbsp;|
-    <?php echo $lnk5 . "\n"; ?>
-         <b><?php echo $strOperations; ?></b><?php if ($lnk5) echo '</a>'; ?>&nbsp;|
     <?php echo $lnk6 . "\n"; ?>
-         <b><?php echo $strOptions; ?></b><?php if ($lnk6) echo '</a>'; ?>&nbsp;]&nbsp;&nbsp;&nbsp;
-    [<a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&amp;back=tbl_properties.php3&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
-         class="drop" onclick="return confirmLink(this, 'DROP TABLE <?php echo PMA_jsFormat($table); ?>')">
-         <b><?php echo $strDrop; ?></b> </a>]
+        <b><?php echo $strEmpty; ?></b><?php if ($lnk6) echo '</a>'; ?>&nbsp;|
+    <a href="tbl_properties_export.php3?<?php echo $url_query; ?>">
+        <b><?php echo $strExport; ?></b></a>&nbsp;|
+    <a href="tbl_properties_operations.php3?<?php echo $url_query; ?>">
+        <b><?php echo $strOperations; ?></b></a>&nbsp;|
+    <a href="tbl_properties_options.php3?<?php echo $url_query; ?>">
+        <b><?php echo $strOptions; ?></b></a>
+    &nbsp;]&nbsp;&nbsp;&nbsp;
+    [&nbsp;
+    <a href="sql.php3?<?php echo ereg_replace('tbl_properties.php3$', 'db_details.php3', $url_query); ?>&amp;back=tbl_properties.php3&amp;reload=1&amp;sql_query=<?php echo urlencode('DROP TABLE ' . PMA_backquote($table)); ?>&amp;zero_rows=<?php echo urlencode(sprintf($strTableHasBeenDropped, htmlspecialchars($table))); ?>"
+        class="drop" onclick="return confirmLink(this, 'DROP TABLE <?php echo PMA_jsFormat($table); ?>')">
+        <b><?php echo $strDrop; ?></b></a>
+    &nbsp;]
 </p>
 <hr />