X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=install-utils.inc;h=105818d4004d860e49adc5af4e65dcb89cf29b61;hb=56fbef2a6cd1222138e2adb55238a1dd4e4c35b0;hp=34dd701762ae998a85095c98fa3a3f01287cee88;hpb=ac549401d4ddaf655ec47cd1e66092fdc83ab30b;p=lhc%2Fweb%2Fwiklou.git

diff --git a/install-utils.inc b/install-utils.inc
index 34dd701762..105818d400 100644
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,8 +1,9 @@
 <?php
 
 function install_version_checks() {
-	# Turn off output buffering if it's on
-	@ob_end_flush();
+	# We dare not turn output buffer _off_ since this will break completely
+	# if PHP is globally configured to run through a gzip filter.
+	@ob_implicit_flush( true );
 	
 	if( !function_exists( "version_compare" ) ) {
 		# version_compare was introduced in 4.1.0
@@ -71,12 +72,14 @@ function replacevars( $ins ) {
 	$varnames = array(
 		"wgDBserver", "wgDBname", "wgDBintlname", "wgDBuser",
 		"wgDBpassword", "wgDBsqluser", "wgDBsqlpassword",
-		"wgDBadminuser", "wgDBadminpassword"
+		"wgDBadminuser", "wgDBadminpassword", "wgDBprefix"
 	);
 
 	foreach ( $varnames as $var ) {
 		global $$var;
 		$ins = str_replace( '{$' . $var . '}', $$var, $ins );
+		$ins = str_replace( '/*$' . $var . '*/`', '`' . $$var, $ins );
+		$ins = str_replace( '/*$' . $var . '*/', $$var, $ins );
 	}
 	return $ins;
 }