summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Gohr <andi@splitbrain.org>2010-04-02 11:34:38 +0200
committerAndreas Gohr <andi@splitbrain.org>2010-04-02 11:34:38 +0200
commitd059ba9bb09b872361eee77c46cbd4aba0042e83 (patch)
tree30e365e4c4b9f7d089a29bc8a5805b3e62c79baa
parent08d7babffe1bded4620d0a3624bdd80522283138 (diff)
downloadrpg-d059ba9bb09b872361eee77c46cbd4aba0042e83.tar.gz
rpg-d059ba9bb09b872361eee77c46cbd4aba0042e83.tar.bz2
Fix gzip compression in combination with buffer flushing FS#1927
This introduces a new function called tpl_flush() which should be used by template authors in favor of the PHP flush() method.
-rw-r--r--inc/template.php13
-rw-r--r--lib/tpl/default/main.php4
2 files changed, 15 insertions, 2 deletions
diff --git a/inc/template.php b/inc/template.php
index 7b0ef466b..3eda2f4af 100644
--- a/inc/template.php
+++ b/inc/template.php
@@ -1407,5 +1407,18 @@ function tpl_subscribe() {
echo '</div>';
}
+/**
+ * Tries to send already created content right to the browser
+ *
+ * Wraps around ob_flush() and flush()
+ *
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+function tpl_flush(){
+ ob_flush();
+ flush();
+}
+
+
//Setup VIM: ex: et ts=4 enc=utf-8 :
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
index b5717c009..d9231678b 100644
--- a/lib/tpl/default/main.php
+++ b/lib/tpl/default/main.php
@@ -82,7 +82,7 @@ if (!defined('DOKU_INC')) die();
<?php }?>
</div>
- <?php flush()?>
+ <?php tpl_flush()?>
<?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
@@ -94,7 +94,7 @@ if (!defined('DOKU_INC')) die();
<div class="clearer">&nbsp;</div>
- <?php flush()?>
+ <?php tpl_flush()?>
<div class="stylefoot">