From 035e073ddbbbeffb6285589fd1faa9513b517ce9 Mon Sep 17 00:00:00 2001
From: Reedy <reedy@wikimedia.org>
Date: Thu, 27 Feb 2020 15:10:29 +0000
Subject: [PATCH] Don't use logging reserved word 'ip' as parameter

Bug: T245280
Change-Id: I368724e9e6de85df45fd8734668789e8d524214f
Follows-up: I5f602bc08902b63acbb0752093b418d0ab063493
---
 includes/auth/CaptchaPreAuthenticationProvider.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/includes/auth/CaptchaPreAuthenticationProvider.php b/includes/auth/CaptchaPreAuthenticationProvider.php
index e3b3a9474..7ee7b1f11 100644
--- a/includes/auth/CaptchaPreAuthenticationProvider.php
+++ b/includes/auth/CaptchaPreAuthenticationProvider.php
@@ -52,11 +52,11 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
 					$needed = true;
 					$captcha->setAction( 'badlogin' );
 					LoggerFactory::getInstance( 'captcha' )
-						->info( 'Captcha shown on login by {ip} for {suggestedUser}', [
+						->info( 'Captcha shown on login by {clientip} for {suggestedUser}', [
 							'event' => 'captcha.display',
 							'eventType' => 'accountcreation',
 							'suggestedUser' => $suggestedUsername,
-							'ip' => $this->manager->getRequest()->getIP()
+							'clientip' => $this->manager->getRequest()->getIP()
 						] );
 					break;
 				}
@@ -87,7 +87,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
 				'eventType' => 'login',
 				'successful' => $success,
 				'user' => $username,
-				'ip' => $ip
+				'clientip' => $ip
 			] );
 		}
 
@@ -116,7 +116,7 @@ class CaptchaPreAuthenticationProvider extends AbstractPreAuthenticationProvider
 					'eventType' => 'accountcreation',
 					'successful' => $success,
 					'user' => $username,
-					'ip' => $ip
+					'clientip' => $ip
 				]
 			);
 			if ( !$success ) {