diff --git a/ChangeLog b/ChangeLog
index 47da114ce..bcd1d2ba2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -22,6 +22,7 @@ $HeadURL: https://phpmyadmin.svn.sourceforge.net/svnroot/phpmyadmin/trunk/phpMyA
 - bug #2461735 [operations] Table operations adds "row_format" 
 - bug #2445213 [export] Commas for CSV Excel 2008 for Mac 
 - bug #2397877 [core] ForceSSL and http auth_type 
+- bug #2473127 [display] Deleting rows displays tbl structure, not contents
 
 3.1.1.0 (2008-12-09)
 - patch #2242765 [core] Navi panel server links wrong,
diff --git a/libraries/common.lib.php b/libraries/common.lib.php
index eae98043b..4c322d78c 100644
--- a/libraries/common.lib.php
+++ b/libraries/common.lib.php
@@ -1500,10 +1500,11 @@ function PMA_localisedDate($timestamp = -1, $format = '')
  * @uses    array_merge()
  * @uses    basename()
  * @param   array   $tab    array with all options
+ * @param   array   $url_params
  * @return  string  html code for one tab, a link if valid otherwise a span
  * @access  public
  */
-function PMA_getTab($tab)
+function PMA_getTab($tab, $url_params = array())
 {
     // default values
     $defaults = array(
@@ -1543,9 +1544,7 @@ function PMA_getTab($tab)
     // build the link
     if (!empty($tab['link'])) {
         $tab['link'] = htmlentities($tab['link']);
-        $tab['link'] = $tab['link'] . $tab['sep']
-            .(empty($GLOBALS['url_query']) ?
-                PMA_generate_common_url() : $GLOBALS['url_query']);
+        $tab['link'] = $tab['link'] . PMA_generate_common_url($url_params);
         if (! empty($tab['args'])) {
             foreach ($tab['args'] as $param => $value) {
                 $tab['link'] .= PMA_get_arg_separator('html') . urlencode($param) . '='
@@ -1596,17 +1595,18 @@ function PMA_getTab($tab)
  * @uses    PMA_getTab()
  * @uses    htmlentities()
  * @param   array   $tabs   one element per tab
- * @param   string  $tag_id id used for the html-tag
+ * @param   array   $url_params
  * @return  string  html-code for tab-navigation
  */
-function PMA_getTabs($tabs, $tag_id = 'topmenu')
+function PMA_getTabs($tabs, $url_params)
 {
+    $tag_id = 'topmenu';
     $tab_navigation =
          '<div id="' . htmlentities($tag_id) . 'container">' . "\n"
         .'<ul id="' . htmlentities($tag_id) . '">' . "\n";
 
     foreach ($tabs as $tab) {
-        $tab_navigation .= PMA_getTab($tab) . "\n";
+        $tab_navigation .= PMA_getTab($tab, $url_params) . "\n";
     }
 
     $tab_navigation .=
diff --git a/libraries/db_links.inc.php b/libraries/db_links.inc.php
index 725d35891..5b024eabb 100644
--- a/libraries/db_links.inc.php
+++ b/libraries/db_links.inc.php
@@ -128,7 +128,8 @@ if (! $db_is_information_schema) {
     }
 }
 
-echo PMA_getTabs($tabs);
+$url_params['db'] = $db;
+echo PMA_getTabs($tabs, $url_params);
 unset($tabs);
 
 /**
diff --git a/libraries/server_links.inc.php b/libraries/server_links.inc.php
index 2aff2acc3..41d1dd1ba 100644
--- a/libraries/server_links.inc.php
+++ b/libraries/server_links.inc.php
@@ -82,7 +82,7 @@ $tabs['import']['icon'] = 'b_import.png';
 $tabs['import']['link'] = 'server_import.php';
 $tabs['import']['text'] = $strImport;
 
-echo PMA_getTabs($tabs);
+echo PMA_getTabs($tabs, array());
 unset($tabs);
 
 
diff --git a/libraries/tbl_links.inc.php b/libraries/tbl_links.inc.php
index 362ba08ff..9ded3aa5f 100644
--- a/libraries/tbl_links.inc.php
+++ b/libraries/tbl_links.inc.php
@@ -24,10 +24,7 @@ require_once './libraries/bookmark.lib.php';
 /**
  * Set parameters for links
  */
-if (empty($url_query)
-|| (isset($_POST['table']) && isset($_POST['new_name']) && $_POST['table'] != $_POST['new_name'])) {
-    $url_query = PMA_generate_common_url($db, $table);
-}
+$url_params = array();
 $url_params['db']    = $db;
 $url_params['table'] = $table;
 
@@ -126,7 +123,7 @@ if ($table_info_num_rows == 0 && !$tbl_is_view) {
     $tabs['search']['warning'] = $strTableIsEmpty;
 }
 
-echo PMA_getTabs($tabs);
+echo PMA_getTabs($tabs, $url_params);
 unset($tabs);
 
 /**
diff --git a/sql.php b/sql.php
index 7cfd12b6e..3a1aaa38a 100644
--- a/sql.php
+++ b/sql.php
@@ -466,7 +466,7 @@ if (isset($GLOBALS['show_as_php']) || !empty($GLOBALS['validatequery'])) {
 } // end else "didn't ask to see php code"
 
 // No rows returned -> move back to the calling page
-if ($num_rows < 1 || $is_affected) {
+if (0 == $num_rows || $is_affected) {
     if ($is_delete) {
         $message = PMA_Message::success('strRowsDeleted');
         $message->addParam($num_rows);
@@ -552,7 +552,7 @@ if ($num_rows < 1 || $is_affected) {
         require './' . $goto;
     } else {
         // avoid a redirect loop when last record was deleted
-        if ('sql.php' == $cfg['DefaultTabTable']) {
+        if (0 == $num_rows && 'sql.php' == $cfg['DefaultTabTable']) {
             $goto = str_replace('sql.php','tbl_structure.php',$goto);
         }
         PMA_sendHeaderLocation($cfg['PmaAbsoluteUri'] . str_replace('&amp;', '&', $goto) . '&message=' . urlencode($message));
diff --git a/test/theme.php b/test/theme.php
index b6453a40d..c4813d1f4 100644
--- a/test/theme.php
+++ b/test/theme.php
@@ -137,7 +137,7 @@ $tabs['import']['link'] = 'server_import.php';
 $tabs['import']['text'] = 'active';
 $tabs['import']['class'] = 'active';
 
-echo PMA_getTabs($tabs);
+echo PMA_getTabs($tabs, array());
 unset($tabs);
 
 if (@file_exists($pmaThemeImage . 'logo_right.png')) {