* (bug 2569) Use PATH_SEPARATOR instead of trying to guess based on DIRECTORY_SEPARAT...

* Require PHP 4.3.2 or higher strictly now.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index c98d882..ed6cdc2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -9,6 +9,7 @@ Misc work going on.....
 
 Big things to note:
 * MySQL 3.23.x is no longer supported.
+* PHP 4.1/4.2 is no longer supported.
 
 
 == Changes since 1.5 ==
@@ -219,6 +220,9 @@ fully support the editing toolbar, but was found to be too confusing.
 * (bug 2721) Regression: Use European number separators for vi: wikis
 * Allow parser cache on redirect targets
 * (bug 3562) for go search, try Caps-Variants-Broken-At-Non-Whitespace
+* (bug 2569) Use PATH_SEPARATOR instead of trying to guess based on
+  DIRECTORY_SEPARATOR (was wrong on NetWare)
+* Require PHP 4.3.2 or higher strictly now.
 
 
 === Caveats ===

diff --git a/config/index.php b/config/index.php
index 02375d6..2f6b992 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -123,7 +123,7 @@ header( "Content-type: text/html; charset=utf-8" );
 # As a dirty hack, we'll try to set up the include path first.
 #
 $IP = dirname( dirname( __FILE__ ) );
-$sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
+$sep = PATH_SEPARATOR;
 ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" );
 
 define( "MEDIAWIKI", true );
@@ -1130,7 +1130,7 @@ function writeLocalSettings( $conf ) {
                $slconf['RightsIcon'] = $conf->RightsIcon;
        }
 
-       $sep = (DIRECTORY_SEPARATOR == "\\") ? ";" : ":";
+       $sep = PATH_SEPARATOR;
        $localsettings = "
 # This file was automatically generated by the MediaWiki installer.
 # If you make manual changes, please keep track in case you need to

diff --git a/install-utils.inc b/install-utils.inc
index 5764c52..2197fe6 100644 (file)
--- a/install-utils.inc
+++ b/install-utils.inc
@@ -7,10 +7,10 @@ function install_version_checks() {
 
        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" );
+               die( "Your PHP version is much too old; 4.0.x will _not_ work. 4.3.2 or higher is required. ABORTING.\n" );
        }
        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";
+               die( "PHP 4.3.2 or higher is required. ABORTING.\n" );
        }
 
        if (!extension_loaded('mysql')) {

diff --git a/maintenance/commandLine.inc b/maintenance/commandLine.inc
index daf1c76..a6274f0 100644 (file)
--- a/maintenance/commandLine.inc
+++ b/maintenance/commandLine.inc
@@ -76,7 +76,7 @@ for( $arg = reset( $argv ); $arg !== false; $arg = next( $argv ) ) {
 $wgCommandLineMode = true;
 # Turn off output buffering if it's on
 @ob_end_flush();
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
+$sep = PATH_SEPARATOR;
 
 if (!isset( $wgUseNormalUser ) ) {
        $wgUseNormalUser = false;

diff --git a/maintenance/liveCmdLine.inc b/maintenance/liveCmdLine.inc
index 529bf6f..f50dce6 100644 (file)
--- a/maintenance/liveCmdLine.inc
+++ b/maintenance/liveCmdLine.inc
@@ -38,7 +38,7 @@ if ( $_ENV['USER'] != "apache" ) {
        $wgDBadminpassword = trim(`wikiadmin_pass`);
 }
 
-$sep = strchr( $include_path = ini_get( "include_path" ), ";" ) ? ";" : ":";
+$sep = PATH_SEPARATOR;
 putenv( "wikilang=$lang");
 $newpath = "/home/wikipedia/common/php-new$sep";