Let pagination function return

git-svn-id: https://adminer.svn.sourceforge.net/svnroot/adminer/trunk@830 7c3ca157-0c34-0410-bff1-cbf682f78f5c

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 791dca3669150a8530a97b7ffd33a6d498486094..ecd15599df5d0b990d6fd65c38a7872d1fd71ba6 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -134,8 +134,8 @@ function remove_from_uri($param = "") {
        return preg_replace("~\\?$param=[^&]*&~", '?', preg_replace("~\\?$param=[^&]*\$|&$param=[^&]*~", '', $_SERVER["REQUEST_URI"]));
 }
 
-function print_pagination($page) {
-       echo " " . ($page == $_GET["page"] ? $page + 1 : '<a href="' . htmlspecialchars(remove_from_uri("page") . ($page ? "&page=$page" : "")) . '">' . ($page + 1) . "</a>");
+function pagination($page) {
+       return " " . ($page == $_GET["page"] ? $page + 1 : '<a href="' . htmlspecialchars(remove_from_uri("page") . ($page ? "&page=$page" : "")) . '">' . ($page + 1) . "</a>");
 }
 
 function get_file($key) {

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index b519a548edbe7d7147da3b04edee6856c8983bd1..d17657343e5a32c5219b3cffdfbb69accceffdc3 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -335,18 +335,11 @@ if (!$columns) {
                        if (intval($limit) && $found_rows > $limit) {
                                // display first, previous 3, next 3 and last page
                                $max_page = floor(($found_rows - 1) / $limit);
-                               echo lang('Page') . ":";
-                               print_pagination(0);
-                               if ($_GET["page"] > 3) {
-                                       echo " ...";
-                               }
+                               echo lang('Page') . ":" . pagination(0) . ($_GET["page"] > 3 ? " ..." : "");
                                for ($i = max(1, $_GET["page"] - 2); $i < min($max_page, $_GET["page"] + 3); $i++) {
-                                       print_pagination($i);
-                               }
-                               if ($_GET["page"] + 3 < $max_page) {
-                                       echo " ...";
+                                       echo pagination($i);
                                }
-                               print_pagination($max_page);
+                               echo ($_GET["page"] + 3 < $max_page ? " ..." : "") . pagination($max_page);
                        }
                        echo " (" . lang('%d row(s)', $found_rows) . ') <label><input type="checkbox" name="all" value="1">' . lang('whole result') . "</label>\n";