Merged my changes from 1.4

[lhc/web/wiklou.git] / install-utils.inc

diff --git a/install-utils.inc b/install-utils.inc
index 34dd701..105818d 100644 (file)
--- 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;
 }