Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't pass 'ip' through to logging

Browse source 
Bug: T245280
Change-Id: Ib89be9f799e79f46dab661a387822cab43703f61
This commit is contained in:
Reedy 2020-02-14 17:46:10 +00:00
parent 9dbd67f0b3
commit 511f9b5d95
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/api/ApiBase.php
View file

@ -1589,7 +1589,7 @@ abstract class ApiBase extends ContextSource {
'feature' => $feature,
// Spaces to underscores in 'username' for historical reasons.
'username' => str_replace( ' ', '_', $this->getUser()->getName() ),
'ip' => $request->getIP(),
'clientip' => $request->getIP(),
'referer' => (string)$request->getHeader( 'Referer' ),
'agent' => $this->getMain()->getUserAgent(),
];
@ -1597,7 +1597,7 @@ abstract class ApiBase extends ContextSource {
// Text string is deprecated. Remove (or replace with just $feature) in MW 1.34.
$s = '"' . addslashes( $ctx['feature'] ) . '"' .
' "' . wfUrlencode( $ctx['username'] ) . '"' .
' "' . $ctx['ip'] . '"' .
' "' . $ctx['clientip'] . '"' .
' "' . addslashes( $ctx['referer'] ) . '"' .
' "' . addslashes( $ctx['agent'] ) . '"';