From: Jakub Vrana <jakub@vrana.cz>
Date: Thu, 11 Jul 2013 23:34:14 +0000 (-0700)
Subject: Mark approximate number of selected rows
X-Git-Tag: v4.0.0~133
X-Git-Url: https://git.joonet.de/?a=commitdiff_plain;h=36d839cf28a1f253398a55513d74c9819fb4a1b8;p=adminer.git

Mark approximate number of selected rows
---

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index 2f467b7a..d00edede 100644
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -493,7 +493,8 @@ if (!$columns && support("table")) {
 			
 			echo "<p>\n";
 			echo ($found_rows !== false ? "(" . ($exact_count ? "" : "~ ") . lang('%d row(s)', $found_rows) . ") " : "");
-			echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$found_rows' : checked); selectCount('selected2', this.checked || !checked ? '$found_rows' : checked);") . "\n";
+			$display_rows = ($exact_count ? "" : "~ ") . $found_rows;
+			echo checkbox("all", 1, 0, lang('whole result'), "var checked = formChecked(this, /check/); selectCount('selected', this.checked ? '$display_rows' : checked); selectCount('selected2', this.checked || !checked ? '$display_rows' : checked);") . "\n";
 			
 			if ($adminer->selectCommandPrint()) {
 				?>
@@ -503,7 +504,7 @@ if (!$columns && support("table")) {
 <fieldset><legend><?php echo lang('Selected'); ?> <span id="selected"></span></legend><div>
 <input type="submit" name="edit" value="<?php echo lang('Edit'); ?>">
 <input type="submit" name="clone" value="<?php echo lang('Clone'); ?>">
-<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? '<?php echo $found_rows; ?>' : formChecked(this, /check/)) + ')');">
+<input type="submit" name="delete" value="<?php echo lang('Delete'); ?>" onclick="return confirm('<?php echo lang('Are you sure?'); ?> (' + (this.form['all'].checked ? '<?php echo $display_rows; ?>' : formChecked(this, /check/)) + ')');">
 </div></fieldset>
 <?php
 			}