jenkins-bot has submitted this change and it was merged.
Change subject: Use context->getRequest() instead of $wgRequest
......................................................................
Use context->getRequest() instead of $wgRequest
Follows-up ca37780
Change-Id: Ifbca6894def6261e2644508d2f979d18503fbecc
---
M UserFunctions_body.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Krinkle: Looks good to me, approved
jenkins-bot: Verified
diff --git a/UserFunctions_body.php b/UserFunctions_body.php
index 2e78793..6c27355 100644
--- a/UserFunctions_body.php
+++ b/UserFunctions_body.php
@@ -181,9 +181,9 @@
* @return string
*/
public static function ip( $parser ) {
- global $wgRequest;
$parser->disableCache();
- return $wgRequest->getIP();
+ $request = self::getUserObj()->getRequest();
+ return $request->getIP();
}
}
--
To view, visit https://gerrit.wikimedia.org/r/147678
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ifbca6894def6261e2644508d2f979d18503fbecc
Gerrit-PatchSet: 3
Gerrit-Project: mediawiki/extensions/UserFunctions
Gerrit-Branch: master
Gerrit-Owner: Withoutaname <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: Krinkle <[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
