Simplify load more data buffering

diff --git a/adminer/include/functions.inc.php b/adminer/include/functions.inc.php
index 1460906e2eb05470d7d24fc52535c07a4d22f1b3..37122a969d676cbb7942dc0f0e62d2ff282775f2 100644 (file)
--- a/adminer/include/functions.inc.php
+++ b/adminer/include/functions.inc.php
@@ -929,10 +929,3 @@ var timeout = setTimeout(function () {
        }
        return array_keys($return);
 }
-
-/** Callback registered to erase output buffer in AJAX calls
-* @return string
-*/
-function clean_output() {
-       return '';
-}

diff --git a/adminer/select.inc.php b/adminer/select.inc.php
index ec1af0821b26488accb20578d029d76d785a9b69..300a6fafdbc68ee9c86b03f2c873b4ff7c09cc7f 100644 (file)
--- a/adminer/select.inc.php
+++ b/adminer/select.inc.php
@@ -190,7 +190,7 @@ if ($_POST && !$error) {
 $table_name = $adminer->tableName($table_status);
 if (is_ajax()) {
        // needs to send headers
-       ob_start('clean_output');
+       ob_start();
 }
 page_header(lang('Select') . ": $table_name", $error);
 
@@ -409,7 +409,7 @@ if (!$columns) {
                        echo (!$group && $select ? "" : "<script type='text/javascript'>tableCheck();</script>\n");
                }
                
-               if ($rows || $page) {
+               if (($rows || $page) && !is_ajax()) {
                        $exact_count = true;
                        if ($_GET["page"] != "last" && +$limit && count($group) >= count($select) && ($found_rows >= $limit || $page)) {
                                $found_rows = found_rows($table_status, $where);
@@ -474,5 +474,6 @@ if (!$columns) {
 }
 
 if (is_ajax()) {
+       ob_end_clean();
        exit;
 }