* Populate rev_parent_id

[lhc/web/wiklou.git] / includes / WebStart.php

diff --git a/includes/WebStart.php b/includes/WebStart.php
index 3758229..a9a6ad5 100644 (file)
--- a/includes/WebStart.php
+++ b/includes/WebStart.php
@@ -85,8 +85,20 @@ 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' );
 }
-?>
+