summaryrefslogtreecommitdiff
path: root/includes/WebStart.php
diff options
context:
space:
mode:
Diffstat (limited to 'includes/WebStart.php')
-rw-r--r--includes/WebStart.php12
1 files changed, 12 insertions, 0 deletions
diff --git a/includes/WebStart.php b/includes/WebStart.php
index 37582290..55c96488 100644
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -85,6 +85,18 @@ if( !file_exists( './LocalSettings.php' ) ) {
# Include this site setttings
require_once( './LocalSettings.php' );
wfProfileOut( 'WebStart.php-conf' );
+wfProfileIn( 'WebStart.php-ob_start' );
+
+# Initialise output buffering
+if ( ob_get_level() ) {
+ # Someone's been mixing configuration data with code!
+ # How annoying.
+} elseif ( !defined( 'MW_NO_OUTPUT_BUFFER' ) ) {
+ require_once( './includes/OutputHandler.php' );
+ ob_start( 'wfOutputHandler' );
+}
+
+wfProfileOut( 'WebStart.php-ob_start' );
if ( !defined( 'MW_NO_SETUP' ) ) {
require_once( './includes/Setup.php' );