cache headers- allow client to cache for one day

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

diff --git a/install-utils.inc b/install-utils.inc
index d78b7b0..608c6ab 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -1,6 +1,9 @@
-<?
+<?php
 
 function install_version_checks() {
+       # Turn off output buffering if it's on
+       @ob_end_flush();
+       
        if( !function_exists( "version_compare" ) ) {
                # version_compare was introduced in 4.1.0
                die( "Your PHP version is much too old; 4.0.x will _not_ work. 4.3.2 or higher is recommended. ABORTING.\n" );
@@ -8,9 +11,6 @@ function install_version_checks() {
        if( version_compare( phpversion(), "4.3.2" ) < 0 ) {
                echo "WARNING: PHP 4.3.2 or higher is recommended. Older versions from 4.1.x up may work but are not actively supported.\n\n";
        }
-       if( !ini_get( "register_globals" ) ) {
-               echo "WARNING: register_globals is not on; MediaWiki currently relies on this option.\n\n";
-       }
        
        if (!extension_loaded('mysql')) {
                if (!dl('mysql.so')) {
@@ -27,16 +27,20 @@ function install_version_checks() {
 }
 
 function copyfile( $sdir, $name, $ddir, $perms = 0664 ) {
+       copyfileto( $sdir, $name, $ddir, $name, $perms );
+}
+
+function copyfileto( $sdir, $sname, $ddir, $dname, $perms = 0664 ) {
        global $wgInstallOwner, $wgInstallGroup;
 
-       $d = "{$ddir}/{$name}";
-       if ( copy( "{$sdir}/{$name}", $d ) ) {
+       $d = "{$ddir}/{$dname}";
+       if ( copy( "{$sdir}/{$sname}", $d ) ) {
                if ( isset( $wgInstallOwner ) ) { chown( $d, $wgInstallOwner ); }
                if ( isset( $wgInstallGroup ) ) { chgrp( $d, $wgInstallGroup ); }
                chmod( $d, $perms );
-               # print "Copied \"{$name}\" to \"{$ddir}\".\n";
+               # print "Copied \"{$sname}\" to \"{$d}\".\n";
        } else {
-               print "Failed to copy file \"{$name}\" to \"{$ddir}\".\n";
+               print "Failed to copy file \"{$sname}\" to \"{$ddir}/{$dname}\".\n";
                exit();
        }
 }