From: Jakub Vrana <jakub@vrana.cz>
Date: Mon, 20 Aug 2012 15:25:20 +0000 (-0700)
Subject: Don't display Load more data on last page
X-Git-Tag: v3.6.0~40
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=68211ac42bc3fc96e455e0780b1a9e31982e5afd;p=adminer.git

Don't display Load more data on last page
---

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index efc2c054..8ad42c83 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -423,11 +423,10 @@ if (!$columns) {
 					echo pagination($i, $page);
 				}
 				echo ($page + 5 < $max_page ? " ..." : "") . ($exact_count && $found_rows !== false ? pagination($max_page, $page) : ' <a href="' . h(remove_from_uri("page") . "&page=last") . '">' . lang('last') . "</a>");
-				if (count($rows) >= $limit) {
-					echo ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" onclick="return !selectLoadMore(this, ' . (+$limit) . ', \'' . lang('Loading') . '\');">' . lang('Load more data') . '</a>';
-				}
 			}
-			echo ($found_rows !== false ? " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ")" : "") . " " . checkbox("all", 1, 0, lang('whole result')) . "\n";
+			echo ($found_rows !== false ? " (" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ")" : "");
+			echo (+$limit && ($found_rows === false ? count($rows) + 1 : $found_rows - $page * $limit) > $limit ? ' <a href="' . h(remove_from_uri("page") . "&page=" . ($page + 1)) . '" onclick="return !selectLoadMore(this, ' . (+$limit) . ', \'' . lang('Loading') . '\');">' . lang('Load more data') . '</a>' : '');
+			echo " " . checkbox("all", 1, 0, lang('whole result')) . "\n";
 			
 			if ($adminer->selectCommandPrint()) {
 				?>