From 9bb55351993584eb8d477bbbb4ae21853a1c99e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michal=20=C4=8Ciha=C5=99?= Date: Wed, 8 Feb 2012 10:02:45 +0100 Subject: [PATCH] Provide Show all button for reasonably small tables --- libraries/display_tbl.lib.php | 2 +- sql.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/display_tbl.lib.php b/libraries/display_tbl.lib.php index 26055a1807..63121ac73a 100644 --- a/libraries/display_tbl.lib.php +++ b/libraries/display_tbl.lib.php @@ -346,7 +346,7 @@ function PMA_displayTableNavigation($pos_next, $pos_prev, $sql_query, $id_for_di } //_if1 // Display the "Show all" button if allowed - if ($GLOBALS['cfg']['ShowAll'] && ($num_rows < $unlim_num_rows)) { + if (($num_rows < $unlim_num_rows) && ($GLOBALS['cfg']['ShowAll'] || ($GLOBALS['cfg']['MaxRows'] * 5 >= $unlim_num_rows))) { echo "\n"; ?> diff --git a/sql.php b/sql.php index d736bdf58c..42d72caae2 100644 --- a/sql.php +++ b/sql.php @@ -448,7 +448,7 @@ if ($GLOBALS['cfg']['RememberSorting'] } // Do append a "LIMIT" clause? -if ((! $cfg['ShowAll'] || $_SESSION['tmp_user_values']['max_rows'] != 'all') +if (($_SESSION['tmp_user_values']['max_rows'] != 'all') && ! ($is_count || $is_export || $is_func || $is_analyse) && isset($analyzed_sql[0]['queryflags']['select_from']) && ! isset($analyzed_sql[0]['queryflags']['offset'])