From 4dda8970d1cd4fed2e96a9a298c977819aa81751 Mon Sep 17 00:00:00 2001
From: Madhura Jayaratne <madhura.cj@gmail.com>
Date: Sat, 4 Jan 2014 13:11:30 +0530
Subject: [PATCH] Preserve table_type and table_group parameters when sorting

Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
---
 libraries/structure.lib.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/libraries/structure.lib.php b/libraries/structure.lib.php
index b2e182419d..5339872e9b 100644
--- a/libraries/structure.lib.php
+++ b/libraries/structure.lib.php
@@ -893,9 +893,15 @@ function PMA_sortableTableHeader($title, $sort, $initial_sort_order = 'ASC')
         'db' => $_REQUEST['db'],
     );
 
-    $url = 'db_structure.php'.PMA_URL_getCommon($_url_params);
+    $url = 'db_structure.php' . PMA_URL_getCommon($_url_params);
     // We set the position back to 0 every time they sort.
     $url .= "&amp;pos=0&amp;sort=$sort&amp;sort_order=$future_sort_order";
+    if (! empty($_REQUEST['tbl_type'])) {
+        $url .= "&amp;tbl_type=" . $_REQUEST['tbl_type'];
+    }
+    if (! empty($_REQUEST['tbl_group'])) {
+        $url .= "&amp;tbl_group=" . $_REQUEST['tbl_group'];
+    }
 
     return PMA_Util::linkOrButton(
         $url, $title . $order_img, $order_link_params
@@ -1835,8 +1841,8 @@ function PMA_getHtmlForActionRowInStructureTable($type, $tbl_storage_engine,
         $action_enabled = false;
     } else {
         $html_output .= '<a rel="samepage" '
-            . ($hasLinkClass ? 'class="ajax add_primary_key_anchor" ' : 
-               ($action=='Index' ? 'class="ajax add_index_anchor"' : 
+            . ($hasLinkClass ? 'class="ajax add_primary_key_anchor" ' :
+               ($action=='Index' ? 'class="ajax add_index_anchor"' :
                 ($action=='Unique' ? 'class="ajax add_unique_anchor"' : ' ')
                )
               )