Ori.livneh has uploaded a new change for review. https://gerrit.wikimedia.org/r/258893
Change subject: Remove wfIsTrustedProxy(), deprecated since 1.24 ...................................................................... Remove wfIsTrustedProxy(), deprecated since 1.24 No usage outside of core: https://github.com/search?utf8=%E2%9C%93&q=%40wikimedia+wfIsTrustedProxy&type=Code&ref=searchresults Change-Id: I86439a772e036dcd5ebdd8b16010c7bacfd9463b --- M docs/hooks.txt M includes/GlobalFunctions.php 2 files changed, 2 insertions(+), 16 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core refs/changes/93/258893/1 diff --git a/docs/hooks.txt b/docs/hooks.txt index fe88fa7..c65cdb6 100644 --- a/docs/hooks.txt +++ b/docs/hooks.txt @@ -1686,9 +1686,9 @@ 'IsFileCacheable': Override the result of Article::isFileCacheable() (if true) &$article: article (object) being checked -'IsTrustedProxy': Override the result of wfIsTrustedProxy() +'IsTrustedProxy': Override the result of IP::isTrustedProxy() &$ip: IP being check -&$result: Change this value to override the result of wfIsTrustedProxy() +&$result: Change this value to override the result of IP::isTrustedProxy() 'IsUploadAllowedFromUrl': Override the result of UploadFromUrl::isAllowedUrl() $url: URL used to upload from diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index 3ca4984..e705dd6 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -4094,20 +4094,6 @@ } /** - * Checks if an IP is a trusted proxy provider. - * Useful to tell if X-Forwarded-For data is possibly bogus. - * CDN cache servers for the site are whitelisted. - * @deprecated Since 1.24, use IP::isTrustedProxy() - * - * @param string $ip - * @return bool - */ -function wfIsTrustedProxy( $ip ) { - wfDeprecated( __METHOD__, '1.24' ); - return IP::isTrustedProxy( $ip ); -} - -/** * Checks if an IP matches a proxy we've configured. * @deprecated Since 1.24, use IP::isConfiguredProxy() * -- To view, visit https://gerrit.wikimedia.org/r/258893 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I86439a772e036dcd5ebdd8b16010c7bacfd9463b Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/core Gerrit-Branch: master Gerrit-Owner: Ori.livneh <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
