jenkins-bot has submitted this change and it was merged.
Change subject: Stop using SiteConfiguration::isLocalVHost()
......................................................................
Stop using SiteConfiguration::isLocalVHost()
It's deprecated and nothing sets it anymore
Change-Id: Ibe8fb02b4b1e609a8ec6a2763b1dce3ec488baed
---
M includes/ZeroSpecialPage.php
1 file changed, 1 insertion(+), 3 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/ZeroSpecialPage.php b/includes/ZeroSpecialPage.php
index 5f14a31..f0e4008 100644
--- a/includes/ZeroSpecialPage.php
+++ b/includes/ZeroSpecialPage.php
@@ -368,11 +368,9 @@
// Check that this domain name is handled by
local servers (disabled in testing)
// Last two or three parts of the domain name
must be found in the local vhost
$hp = explode( '.', $urlParts['host'] );
- global $wgZeroSiteOverride, $wgConf;
+ global $wgZeroSiteOverride;
if ( $wgZeroSiteOverride ||
- $wgConf->isLocalVHost( implode( '.',
array_slice( $hp, -2, 2 ) ) ) ||
in_array( implode( '.', array_slice(
$hp, -2, 2 ) ), $wgLocalVirtualHosts ) ||
- $wgConf->isLocalVHost( implode( '.',
array_slice( $hp, -3, 3 ) ) ) ||
in_array( implode( '.', array_slice(
$hp, -3, 3 ) ), $wgLocalVirtualHosts )
) {
if ( $hp[1] === 'zero' ) {
--
To view, visit https://gerrit.wikimedia.org/r/270021
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibe8fb02b4b1e609a8ec6a2763b1dce3ec488baed
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/ZeroBanner
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
