beenull/adminerevo
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Simplify load more data buffering

Browse source
This commit is contained in:
Jakub Vrana 2012-09-07 00:51:43 -07:00
parent b7f1d56fe0
commit 09d81ffee9
2 changed files with 3 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
adminer/include/functions.inc.php
View file

@ -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 '';
}

5
adminer/select.inc.php
View file

@ -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;
}