jenkins-bot has submitted this change and it was merged.
Change subject: Rename $wgServerSetting to $serverSetting
......................................................................
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
---
M includes/installer/LocalSettingsGenerator.php
1 file changed, 4 insertions(+), 4 deletions(-)
Approvals:
Siebrand: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/installer/LocalSettingsGenerator.php
b/includes/installer/LocalSettingsGenerator.php
index 56d8353..301db14 100644
--- a/includes/installer/LocalSettingsGenerator.php
+++ b/includes/installer/LocalSettingsGenerator.php
@@ -222,10 +222,10 @@
}
}
- $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 @@
## 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\";
--
To view, visit https://gerrit.wikimedia.org/r/97320
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I38c82d363f588648f11d0a0ab3e264e25553493e
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Platonides <[email protected]>
Gerrit-Reviewer: Siebrand <[email protected]>
Gerrit-Reviewer: Waldir <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
