From f5b43f4ecdfb9dd8bb1aec64a0b40d040a007e9d Mon Sep 17 00:00:00 2001 From: Chad Horohoe Date: Sun, 8 Aug 2010 16:35:17 +0000 Subject: [PATCH] (bug 24408) Remove include path changes in LocalSettings.php. Not needed, as everything should be in the Autoloader --- RELEASE-NOTES | 1 + includes/installer/LocalSettingsGenerator.php | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/RELEASE-NOTES b/RELEASE-NOTES index b2ad928ec4..408bb95cf9 100644 --- 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 8b2e266c91..d09a56f760 100644 --- 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 ) { -- 2.20.1