Fix bug link for PhpRefCallBugTester class

[lhc/web/wiklou.git] / includes / installer / LocalSettingsGenerator.php

diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php
index 37ddd61..94c84e3 100644 (file)
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -46,7 +46,7 @@ class LocalSettingsGenerator {
                                'wgRightsText', 'wgRightsCode', 'wgMainCacheType', 'wgEnableUploads',
                                'wgMainCacheType', '_MemCachedServers', 'wgDBserver', 'wgDBuser',
                                'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin',
-                               'wgMetaNamespace'
+                               'wgMetaNamespace', 'wgResourceLoaderMaxQueryLength'
                        ),
                        $db->getGlobalNames()
                );
@@ -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;
        }
 
@@ -271,10 +277,6 @@ if ( !defined( 'MEDIAWIKI' ) ) {
 ## this, if it's not already uncommented:
 {$hashedUploads}\$wgHashedUploadDirectory = false;
 
-## If you have the appropriate support software installed
-## you can enable inline LaTeX equations:
-\$wgUseTeX           = false;
-
 ## Set \$wgCacheDirectory to a writable directory on the web server
 ## to make your wiki go slightly faster. The directory should not
 ## be publically accessible from the web.
@@ -306,8 +308,11 @@ 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
+# Query string length limit for ResourceLoader. You should only set this if
+# your web server has a query string length limit (then set it to that limit),
+# or if you have suhosin.get.max_value_length set in php.ini (then set it to
+# that value)
+\$wgResourceLoaderMaxQueryLength = {$this->values['wgResourceLoaderMaxQueryLength']};
 ";
        }