nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug #3308476 [interface] "Show all" not persistent after a sort

Browse Source
This commit is contained in:
Marc Delisle
2011-05-27 16:00:40 -04:00
parent 4a4d312edb
commit 72bc4b6543
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -11,6 +11,7 @@
- [auth] Fixed error handling for signon auth method. - [auth] Fixed error handling for signon auth method.
- bug #3276001 [core] Avoid caching of index.php. - bug #3276001 [core] Avoid caching of index.php.
- bug #3306958 [interface] Unnecessary Details slider - bug #3306958 [interface] Unnecessary Details slider
- bug #3308476 [interface] "Show all" not persistent after a sort
3.4.1.0 (2011-05-20) 3.4.1.0 (2011-05-20)
- bug #3301108 [interface] Synchronize and already configured host - bug #3301108 [interface] Synchronize and already configured host

12
libraries/display_tbl.lib.php
View File

@@ -445,6 +445,11 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
global $sql_query, $num_rows; global $sql_query, $num_rows;
global $vertical_display, $highlight_columns; global $vertical_display, $highlight_columns;
// required to generate sort links that will remember whether the
// "Show all" button has been clicked
$sql_md5 = md5($GLOBALS['sql_query']);
$session_max_rows = $_SESSION['tmp_user_values']['query'][$sql_md5]['max_rows'];
if ($analyzed_sql == '') { if ($analyzed_sql == '') {
$analyzed_sql = array(); $analyzed_sql = array();
} }
@@ -820,9 +825,10 @@ function PMA_displayTableHeaders(&$is_display, &$fields_meta, $fields_cnt = 0, $
$sorted_sql_query = $unsorted_sql_query . $sort_order; $sorted_sql_query = $unsorted_sql_query . $sort_order;
} }
$_url_params = array( $_url_params = array(
'db' => $db, 'db' => $db,
'table' => $table, 'table' => $table,
'sql_query' => $sorted_sql_query, 'sql_query' => $sorted_sql_query,
'session_max_rows' => $session_max_rows
); );
$order_url = 'sql.php' . PMA_generate_common_url($_url_params); $order_url = 'sql.php' . PMA_generate_common_url($_url_params);