| Index: trunk/phase3/config/index.php |
| — | — | @@ -29,10 +29,6 @@ |
| 30 | 30 | # Attempt to set up the include path, to fix problems with relative includes |
| 31 | 31 | $IP = dirname( dirname( __FILE__ ) ); |
| 32 | 32 | define( 'MW_INSTALL_PATH', $IP ); |
| 33 | | -$sep = PATH_SEPARATOR; |
| 34 | | -if( !ini_set( "include_path", ".$sep$IP$sep$IP/includes$sep$IP/languages" ) ) { |
| 35 | | - set_include_path( ".$sep$IP$sep$IP/includes$sep$IP/languages" ); |
| 36 | | -} |
| 37 | 33 | |
| 38 | 34 | # Define an entry point and include some files |
| 39 | 35 | define( "MEDIAWIKI", true ); |
| — | — | @@ -40,17 +36,17 @@ |
| 41 | 37 | |
| 42 | 38 | // Run version checks before including other files |
| 43 | 39 | // so people don't see a scary parse error. |
| 44 | | -require_once( "install-utils.inc" ); |
| | 40 | +require_once( "$IP/install-utils.inc" ); |
| 45 | 41 | install_version_checks(); |
| 46 | 42 | |
| 47 | | -require_once( "includes/Defines.php" ); |
| 48 | | -require_once( "includes/DefaultSettings.php" ); |
| 49 | | -require_once( "includes/AutoLoader.php" ); |
| 50 | | -require_once( "includes/MagicWord.php" ); |
| 51 | | -require_once( "includes/Namespace.php" ); |
| 52 | | -require_once( "includes/ProfilerStub.php" ); |
| 53 | | -require_once( "includes/GlobalFunctions.php" ); |
| 54 | | -require_once( "includes/Hooks.php" ); |
| | 43 | +require_once( "$IP/includes/Defines.php" ); |
| | 44 | +require_once( "$IP/includes/DefaultSettings.php" ); |
| | 45 | +require_once( "$IP/includes/AutoLoader.php" ); |
| | 46 | +require_once( "$IP/includes/MagicWord.php" ); |
| | 47 | +require_once( "$IP/includes/Namespace.php" ); |
| | 48 | +require_once( "$IP/includes/ProfilerStub.php" ); |
| | 49 | +require_once( "$IP/includes/GlobalFunctions.php" ); |
| | 50 | +require_once( "$IP/includes/Hooks.php" ); |
| 55 | 51 | |
| 56 | 52 | # If we get an exception, the user needs to know |
| 57 | 53 | # all the details |
| — | — | @@ -232,8 +228,8 @@ |
| 233 | 229 | } |
| 234 | 230 | |
| 235 | 231 | |
| 236 | | -require_once( "install-utils.inc" ); |
| 237 | | -require_once( "maintenance/updaters.inc" ); |
| | 232 | +require_once( "$IP/install-utils.inc" ); |
| | 233 | +require_once( "$IP/maintenance/updaters.inc" ); |
| 238 | 234 | |
| 239 | 235 | class ConfigData { |
| 240 | 236 | function getEncoded( $data ) { |
| — | — | @@ -497,7 +493,7 @@ |
| 498 | 494 | "/opt/csw/bin", |
| 499 | 495 | "/usr/gnu/bin", |
| 500 | 496 | "/usr/sfw/bin" ), |
| 501 | | - explode( $sep, getenv( "PATH" ) ) ); |
| | 497 | + explode( PATH_SEPARATOR, getenv( "PATH" ) ) ); |
| 502 | 498 | $diff3names = array( "gdiff3", "diff3", "diff3.exe" ); |
| 503 | 499 | |
| 504 | 500 | $diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' ); |
| — | — | @@ -548,6 +544,7 @@ |
| 549 | 545 | $path = ($_SERVER["PHP_SELF"] === '') |
| 550 | 546 | ? $_SERVER["SCRIPT_NAME"] |
| 551 | 547 | : $_SERVER["PHP_SELF"]; |
| | 548 | + |
| 552 | 549 | $conf->ScriptPath = preg_replace( '{^(.*)/config.*$}', '$1', $path ); |
| 553 | 550 | print "<li>Script URI path: <tt>" . htmlspecialchars( $conf->ScriptPath ) . "</tt></li>\n"; |
| 554 | 551 | |
| — | — | @@ -755,7 +752,7 @@ |
| 756 | 753 | |
| 757 | 754 | $wgCommandLineMode = true; |
| 758 | 755 | $wgUseDatabaseMessages = false; /* FIXME: For database failure */ |
| 759 | | - require_once( "includes/Setup.php" ); |
| | 756 | + require_once( "$IP/includes/Setup.php" ); |
| 760 | 757 | chdir( "config" ); |
| 761 | 758 | |
| 762 | 759 | $wgTitle = Title::newFromText( "Installation script" ); |
| — | — | @@ -1566,7 +1563,7 @@ |
| 1567 | 1564 | \$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" ); |
| 1568 | 1565 | set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_include_path() ); |
| 1569 | 1566 | |
| 1570 | | -require_once( \"includes/DefaultSettings.php\" ); |
| | 1567 | +require_once( \"\$IP/includes/DefaultSettings.php\" ); |
| 1571 | 1568 | |
| 1572 | 1569 | # If PHP's memory limit is very low, some operations may fail. |
| 1573 | 1570 | " . ($conf->raiseMemory ? '' : '# ' ) . "ini_set( 'memory_limit', '20M' );" . " |
| — | — | @@ -1755,9 +1752,9 @@ |
| 1756 | 1753 | } |
| 1757 | 1754 | |
| 1758 | 1755 | function getLanguageList() { |
| 1759 | | - global $wgLanguageNames; |
| | 1756 | + global $wgLanguageNames, $IP; |
| 1760 | 1757 | if( !isset( $wgLanguageNames ) ) { |
| 1761 | | - require_once( "languages/Names.php" ); |
| | 1758 | + require_once( "$IP/languages/Names.php" ); |
| 1762 | 1759 | } |
| 1763 | 1760 | |
| 1764 | 1761 | $codes = array(); |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -367,7 +367,10 @@ |
| 368 | 368 | * (bug 4530) Fix local name of Kurdish language |
| 369 | 369 | * (bug 10830) Fix local name Haitian Creole language |
| 370 | 370 | * Fix comments in contributions and log pages for RTL languages |
| | 371 | +* Make installer include_path-independent, so it should work on hosts which |
| | 372 | + disable user setting of PHP include_path setting |
| 371 | 373 | |
| | 374 | + |
| 372 | 375 | == API changes since 1.10 == |
| 373 | 376 | |
| 374 | 377 | Full API documentation is available at http://www.mediawiki.org/wiki/API |