r83518 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r83517‎ | r83518 | r83519 >
Date:09:28, 8 March 2011
Author:maxsem
Status:ok
Tags:
Comment:
LocalSettings generation tweaks:
* Mention extensions only if user chose some during installation
* Added a comment at the bottom suggesting where to put new settings
Modified paths:
  • /trunk/phase3/includes/installer/LocalSettingsGenerator.php (modified) (history)

Diff [purge]

Index: trunk/phase3/includes/installer/LocalSettingsGenerator.php
@@ -111,7 +111,10 @@
112112 $localSettings = $this->getDefaultText();
113113
114114 if( count( $this->extensions ) ) {
115 - $localSettings .= "\n# The following extensions were automatically enabled:\n";
 115+ $localSettings .= "
 116+# Enabled Extensions. Most extensions are enabled by including the base extension file here
 117+# but check specific extension documentation for more details
 118+# The following extensions were automatically enabled:\n";
116119
117120 foreach( $this->extensions as $extName ) {
118121 $encExtName = self::escapePhpString( $extName );
@@ -119,6 +122,9 @@
120123 }
121124 }
122125
 126+ $localSettings .= "\n\n# End of automatically generated settings.
 127+# Add more configuration options below.\n\n";
 128+
123129 return $localSettings;
124130 }
125131
@@ -305,9 +311,6 @@
306312
307313 # Path to the GNU diff3 utility. Used for conflict resolution.
308314 \$wgDiff3 = \"{$this->values['wgDiff3']}\";
309 -
310 -# Enabled Extensions. Most extensions are enabled by including the base extension file here
311 -# but check specific extension documentation for more details
312315 ";
313316 }
314317

Sign-offs

UserFlagDate
Krinkleinspected00:18, 17 March 2011

Status & tagging log