diff options
author | Guy Brand <gb@unistra.fr> | 2013-05-10 14:35:28 +0200 |
---|---|---|
committer | Guy Brand <gb@unistra.fr> | 2013-05-10 14:35:28 +0200 |
commit | 83f133d10eda8c1c6b6429c08b2d0722ca88ca17 (patch) | |
tree | 0377662d2335a0e2160175d5be3b95a92f6bb332 /lib/exe/indexer.php | |
parent | bc250e0ee2ec4fba891b53aa4f1814ce648ac71a (diff) | |
parent | 2a5a1456564635ddbca06edbc902e7f820d2a97b (diff) | |
download | rpg-83f133d10eda8c1c6b6429c08b2d0722ca88ca17.tar.gz rpg-83f133d10eda8c1c6b6429c08b2d0722ca88ca17.tar.bz2 |
Merge branch master into stable
Diffstat (limited to 'lib/exe/indexer.php')
-rw-r--r-- | lib/exe/indexer.php | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/lib/exe/indexer.php b/lib/exe/indexer.php index 27576f76d..57bee8925 100644 --- a/lib/exe/indexer.php +++ b/lib/exe/indexer.php @@ -16,15 +16,16 @@ if(!defined('NL')) define('NL',"\n"); // check if user abort worked, if yes send output early $defer = !@ignore_user_abort() || $conf['broken_iua']; -if(!$defer){ +$output = $INPUT->has('debug') && $conf['allowdebug']; +if(!$defer && !$output){ sendGIF(); // send gif } $ID = cleanID($INPUT->str('id')); // Catch any possible output (e.g. errors) -$output = $INPUT->has('debug') && $conf['allowdebug']; if(!$output) ob_start(); +else header('Content-Type: text/plain'); // run one of the jobs $tmp = array(); // No event data @@ -192,11 +193,6 @@ function sendDigest() { * @author Harry Fuecks <fuecks@gmail.com> */ function sendGIF(){ - global $INPUT; - if($INPUT->has('debug')){ - header('Content-Type: text/plain'); - return; - } $img = base64_decode('R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAEALAAAAAABAAEAAAIBTAA7'); header('Content-Type: image/gif'); header('Content-Length: '.strlen($img)); |