diff options
author | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
---|---|---|
committer | Pierre Schmitz <pierre@archlinux.de> | 2012-05-03 13:01:35 +0200 |
commit | d9022f63880ce039446fba8364f68e656b7bf4cb (patch) | |
tree | 16b40fbf17bf7c9ee6f4ead25b16dd192378050a /includes/installer/LocalSettingsGenerator.php | |
parent | 27cf83d177256813e2e802241085fce5dd0f3fb9 (diff) |
Update to MediaWiki 1.19.0
Diffstat (limited to 'includes/installer/LocalSettingsGenerator.php')
-rw-r--r-- | includes/installer/LocalSettingsGenerator.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index a3ab21ea..89154e58 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -44,7 +44,7 @@ class LocalSettingsGenerator { 'wgLanguageCode', 'wgEnableEmail', 'wgEnableUserEmail', 'wgDiff3', 'wgEnotifUserTalk', 'wgEnotifWatchlist', 'wgEmailAuthentication', 'wgDBtype', 'wgSecretKey', 'wgRightsUrl', 'wgSitename', 'wgRightsIcon', - 'wgRightsText', 'wgRightsCode', 'wgMainCacheType', 'wgEnableUploads', + 'wgRightsText', 'wgMainCacheType', 'wgEnableUploads', 'wgMainCacheType', '_MemCachedServers', 'wgDBserver', 'wgDBuser', 'wgDBpassword', 'wgUseInstantCommons', 'wgUpgradeKey', 'wgDefaultSkin', 'wgMetaNamespace', 'wgResourceLoaderMaxQueryLength' @@ -187,7 +187,7 @@ class LocalSettingsGenerator { $locale = ''; } - $rightsUrl = $this->values['wgRightsUrl'] ? '' : '#'; + //$rightsUrl = $this->values['wgRightsUrl'] ? '' : '#'; // TODO: Fixme, I'm unused! $hashedUploads = $this->safeMode ? '' : '#'; $metaNamespace = ''; if( $this->values['wgMetaNamespace'] !== $this->values['wgSitename'] ) { @@ -329,7 +329,6 @@ if ( !defined( 'MEDIAWIKI' ) ) { \$wgRightsUrl = \"{$this->values['wgRightsUrl']}\"; \$wgRightsText = \"{$this->values['wgRightsText']}\"; \$wgRightsIcon = \"{$this->values['wgRightsIcon']}\"; -# \$wgRightsCode = \"{$this->values['wgRightsCode']}\"; # Not yet used # Path to the GNU diff3 utility. Used for conflict resolution. \$wgDiff3 = \"{$this->values['wgDiff3']}\"; |