Andrew Bogott has submitted this change and it was merged.
Change subject: Don't override $wgServer if $_SERVER["SERVER_NAME"] is
undefined.
......................................................................
Don't override $wgServer if $_SERVER["SERVER_NAME"] is undefined.
It's always defined for page loads, but was causing a spurious notice
during run of commandline tools.
Change-Id: Ie451ade8008b8d4bf9637d935a87e632db05c04f
---
M modules/mediawiki_singlenode/templates/labs-localsettings
1 file changed, 3 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Verified; Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/mediawiki_singlenode/templates/labs-localsettings
b/modules/mediawiki_singlenode/templates/labs-localsettings
index 7de451d..eb42aa5 100644
--- a/modules/mediawiki_singlenode/templates/labs-localsettings
+++ b/modules/mediawiki_singlenode/templates/labs-localsettings
@@ -27,7 +27,9 @@
# Include the complete settings file generated by mw install
require_once( 'orig/LocalSettings.php' );
-$wgServer = "//" . $_SERVER["SERVER_NAME"];
+if ( array_key_exists( "SERVER_NAME", $_SERVER ) ) {
+ $wgServer = "//" . $_SERVER["SERVER_NAME"];
+}
if ( ! $wgLogo or $wgLogo == '/wiki/skins/common/images/wiki.png' ) {
# Logo is either unset or defaulting to the standard wiki logo;
--
To view, visit https://gerrit.wikimedia.org/r/67311
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie451ade8008b8d4bf9637d935a87e632db05c04f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Aude <[email protected]>
Gerrit-Reviewer: Manybubbles <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
