From 0e75eebf02d6cebde0e36d823a7ba926ea52173f Mon Sep 17 00:00:00 2001 From: Platonides Date: Sat, 23 Nov 2013 19:41:20 +0100 Subject: [PATCH] Rename $wgServerSetting to $serverSetting It's the setting for $wgServer, but let's not confuse humans and tools by using the convention for globals. Change-Id: I38c82d363f588648f11d0a0ab3e264e25553493e --- includes/installer/LocalSettingsGenerator.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/includes/installer/LocalSettingsGenerator.php b/includes/installer/LocalSettingsGenerator.php index 56d8353758..301db14e94 100644 --- a/includes/installer/LocalSettingsGenerator.php +++ b/includes/installer/LocalSettingsGenerator.php @@ -222,10 +222,10 @@ class LocalSettingsGenerator { } } - $wgServerSetting = ""; + $serverSetting = ""; if ( array_key_exists( 'wgServer', $this->values ) && $this->values['wgServer'] !== null ) { - $wgServerSetting = "\n## The protocol and server name to use in fully-qualified URLs\n"; - $wgServerSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n"; + $serverSetting = "\n## The protocol and server name to use in fully-qualified URLs\n"; + $serverSetting .= "\$wgServer = \"{$this->values['wgServer']}\";\n"; } switch ( $this->values['wgMainCacheType'] ) { @@ -271,7 +271,7 @@ if ( !defined( 'MEDIAWIKI' ) ) { ## http://www.mediawiki.org/wiki/Manual:Short_URL \$wgScriptPath = \"{$this->values['wgScriptPath']}\"; \$wgScriptExtension = \"{$this->values['wgScriptExtension']}\"; -${wgServerSetting} +${serverSetting} ## The relative URL path to the skins directory \$wgStylePath = \"\$wgScriptPath/skins\"; -- 2.20.1