From db5675164de0f39d644143b12525fa242178e444 Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Tue, 8 Mar 2011 09:28:13 +0000 Subject: [PATCH] LocalSettings generation tweaks: * Mention extensions only if user chose some during installation * Added a comment at the bottom suggesting where to put new settings --- includes/installer/LocalSettingsGenerator.php | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index 37ddd6153f..5439430eff 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -111,7 +111,10 @@ class LocalSettingsGenerator { $localSettings = $this->getDefaultText(); if( count( $this->extensions ) ) { - $localSettings .= "\n# The following extensions were automatically enabled:\n"; + $localSettings .= " +# Enabled Extensions. Most extensions are enabled by including the base extension file here +# but check specific extension documentation for more details +# The following extensions were automatically enabled:\n"; foreach( $this->extensions as $extName ) { $encExtName = self::escapePhpString( $extName ); @@ -119,6 +122,9 @@ class LocalSettingsGenerator { } } + $localSettings .= "\n\n# End of automatically generated settings. +# Add more configuration options below.\n\n"; + return $localSettings; } @@ -305,9 +311,6 @@ if ( !defined( 'MEDIAWIKI' ) ) { # Path to the GNU diff3 utility. Used for conflict resolution. \$wgDiff3 = \"{$this->values['wgDiff3']}\"; - -# Enabled Extensions. Most extensions are enabled by including the base extension file here -# but check specific extension documentation for more details "; } -- 2.20.1