Fixed recently committed error.

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

diff --git a/install-utils.inc b/install-utils.inc
index 0ba6eca..fa7b80e 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -14,6 +14,16 @@ function install_version_checks() {
                echo "PHP 5.0.0 or higher is required. ABORTING.\n";
                die( -1 );
        }
+       
+       // Test for PHP bug which breaks PHP 5.0.x on 64-bit...
+       // As of 1.8 this breaks lots of common operations instead
+       // of just some rare ones like export.
+       $borked = str_replace( 'a', 'b', array( -1 => -1 ) );
+       if( !isset( $borked[-1] ) ) {
+               echo "PHP 5.0.x is buggy on your 64-bit system; you must upgrade to PHP 5.1.x\n" .
+                       "or higher. ABORTING. (http://bugs.php.net/bug.php?id=34879 for details)\n";
+               die( -1 );
+       }
 
        global $wgCommandLineMode;
        $wgCommandLineMode = true;
@@ -51,12 +61,9 @@ function copydirectory( $source, $dest ) {
 }
 
 function readconsole( $prompt = '' ) {
-       static $isatty = null, $fp = null;
-       if ( is_null( $fp ) ) {
-               $fp = fopen( 'php://stdin', 'r' );
-       }
+       static $isatty = null;
        if ( is_null( $isatty ) ) {
-               if ( !function_exists( 'posix_isatty' ) || posix_isatty( $fp ) ) {
+               if ( !function_exists( 'posix_isatty' ) || posix_isatty( STDIN ) ) {
                        $isatty = true;
                } else {
                        $isatty = false;
@@ -69,10 +76,10 @@ function readconsole( $prompt = '' ) {
                if ( $isatty ) {
                        print $prompt;
                }
-               if ( feof( $fp ) ) {
+               if ( feof( STDIN ) ) {
                        return false;
                }
-               $st = fgets($fp, 1024);
+               $st = fgets(STDIN, 1024);
                if ($st === false) return false;
                $resp = trim( $st );
                return $resp;