Changed default LocalSettings.php to append the previous include path when setting it

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index f3f0fe7..2be3bd3 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -207,6 +207,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Introduce $wgAllowTitlesInSVG, which allows the <title> attribute in uploaded files
   bearing the image/svg MIME type. Disabled by default due to the vast majority of
   web servers being hideously misconfigured. See DefaultSettings.php for more details.
+* Changed default LocalSettings.php to append the previous include path when setting it
 
 == Compatibility ==
 

diff --git a/config/index.php b/config/index.php
index 6b20948..bebff03 100644 (file)
--- a/config/index.php
+++ b/config/index.php
@@ -1182,7 +1182,7 @@ if( defined( 'MW_INSTALL_PATH' ) ) {
 }
 
 \$path = array( \$IP, \"\$IP/includes\", \"\$IP/languages\" );
-set_include_path( implode( PATH_SEPARATOR, \$path ) );
+set_include_path( implode( PATH_SEPARATOR, \$path ) . PATH_SEPARATOR . get_include_path() );
 
 require_once( \"includes/DefaultSettings.php\" );