jenkins-bot has submitted this change and it was merged.
Change subject: Fix host detection for CLI scripts
......................................................................
Fix host detection for CLI scripts
Bug: T90361
Change-Id: I67237e2a30bf29f08fd386b94eb22d69b8ffe911
---
M puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
BryanDavis: Looks good to me, approved
jenkins-bot: Verified
diff --git
a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
index 8f08d68..cb833f3 100644
--- a/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
+++ b/puppet/modules/mediawiki/templates/multiwiki/CommonSettings.php.erb
@@ -37,5 +37,7 @@
include_once $conffile;
}
-# Bug 66399: set wgServer from inbound request
-$wgServer = WebRequest::detectServer();
+if ( PHP_SAPI !== 'cli' ) {
+ # T68399: set wgServer from inbound request
+ $wgServer = WebRequest::detectServer();
+}
--
To view, visit https://gerrit.wikimedia.org/r/193550
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I67237e2a30bf29f08fd386b94eb22d69b8ffe911
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/vagrant
Gerrit-Branch: master
Gerrit-Owner: Gergő Tisza <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Ori.livneh <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
