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: Idad23551c7c31c9d05fd9e1be2efadc941860058
---
M includes/HttpFunctions.php
1 file changed, 2 insertions(+), 4 deletions(-)
Approvals:
Legoktm: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/HttpFunctions.php b/includes/HttpFunctions.php
index 5ede04f..a31b157 100644
--- a/includes/HttpFunctions.php
+++ b/includes/HttpFunctions.php
@@ -131,7 +131,7 @@
* @return bool
*/
public static function isLocalURL( $url ) {
- global $wgCommandLineMode, $wgLocalVirtualHosts, $wgConf;
+ global $wgCommandLineMode, $wgLocalVirtualHosts;
if ( $wgCommandLineMode ) {
return false;
@@ -156,9 +156,7 @@
$domain = $domainPart . '.' . $domain;
}
- if ( in_array( $domain, $wgLocalVirtualHosts )
- || $wgConf->isLocalVHost( $domain )
- ) {
+ if ( in_array( $domain, $wgLocalVirtualHosts )
) {
return true;
}
}
--
To view, visit https://gerrit.wikimedia.org/r/270022
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Idad23551c7c31c9d05fd9e1be2efadc941860058
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: 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
