(bug 24408) Remove include path changes in LocalSettings.php. Not needed, as everythi...

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index b2ad928..408bb95 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -53,6 +53,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Removed unused globals: $wgEnableSerializedMessages, $wgCheckSerialized,
   $wgUseMemCached, $wgDisableSearchContext, $wgColorErrors,
   $wgUseZhdaemon, $wgZhdaemonHost and $wgZhdaemonPort.
+* (bug 24408) The include_path is not modified in the default LocalSettings.php
 
 === New features in 1.17 ===
 * (bug 10183) Users can now add personal styles and scripts to all skins via

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 8b2e266..d09a56f 100644 (file)
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -191,9 +191,6 @@ if( defined( 'MW_INSTALL_PATH' ) ) {
        \$IP = dirname( __FILE__ );
 }
 
-\$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
-set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_include_path() );
-
 require_once( \"\$IP/includes/DefaultSettings.php\" );
 
 if ( \$wgCommandLineMode ) {