Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Čihař <mcihar@suse.cz>2012-02-08 13:02:45 +0400
committerMichal Čihař <mcihar@suse.cz>2012-02-08 13:03:05 +0400
commit9bb55351993584eb8d477bbbb4ae21853a1c99e7 (patch)
tree70b18317517ce2ddcd1d6eb0504c277669995408 /sql.php
parent8ec7e8587f1f2afc65227b05ff75ac071628dd75 (diff)
Provide Show all button for reasonably small tables
Diffstat (limited to 'sql.php')
-rw-r--r--sql.php2
1 files changed, 1 insertions, 1 deletions
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'])