From: Chad Horohoe <demon@users.mediawiki.org>
Date: Tue, 9 Aug 2011 13:59:36 +0000 (+0000)
Subject: (bug 30264) MediaWiki installer uses require, de facto is require_once
X-Git-Tag: 1.31.0-rc.0~28384
X-Git-Url: http://git.cyclocoop.org/ecrire?a=commitdiff_plain;h=3852b5a03806c6d6079ca17c55a9e98f95740c06;p=lhc%2Fweb%2Fwiklou.git

(bug 30264) MediaWiki installer uses require, de facto is require_once
---

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 4d3f0f3cd9..25c619ff47 100644
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -38,6 +38,8 @@ production.
   div#bodyContent.
 * (bug 30172) The check for posix_isatty() in maintenance scripts did not detect
   when the function exists but is disabled. Introduced Maintenance::posix_isatty()
+* (bug 30264) Changed installer-generated LocalSettings.php to use require_once()
+  instead require() for included extensions.
 
 === API changes in 1.19 ===
 * (bug 19838) siprop=interwikimap can now use the interwiki cache.
diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 64def40877..df3192c1ea 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -129,7 +129,7 @@ class LocalSettingsGenerator {
 
 			foreach( $this->extensions as $extName ) {
 				$encExtName = self::escapePhpString( $extName );
-				$localSettings .= "require( \"extensions/$encExtName/$encExtName.php\" );\n";
+				$localSettings .= "require_once( \"extensions/$encExtName/$encExtName.php\" );\n";
 			}
 		}