CSteipp has submitted this change and it was merged.
Change subject: Make AbuseLog searchable by IPv6 IPs
......................................................................
Make AbuseLog searchable by IPv6 IPs
Bug: 39449
Change-Id: Ie331ec7ef3b461ae10f0e28fe50cb86684c6d3a0
---
M special/SpecialAbuseLog.php
1 file changed, 7 insertions(+), 5 deletions(-)
Approvals:
CSteipp: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/special/SpecialAbuseLog.php b/special/SpecialAbuseLog.php
index 1de7254..38a0f15 100644
--- a/special/SpecialAbuseLog.php
+++ b/special/SpecialAbuseLog.php
@@ -70,14 +70,17 @@
$request = $this->getRequest();
- $this->mSearchUser = $request->getText( 'wpSearchUser' );
+ $this->mSearchUser = trim( $request->getText( 'wpSearchUser' )
);
if ( $wgAbuseFilterIsCentral ) {
$this->mSearchWiki = $request->getText( 'wpSearchWiki'
);
}
- $t = Title::newFromText( trim( $this->mSearchUser ) );
- if ( $t ) {
- $this->mSearchUser = $t->getText(); // Username
normalisation
+ $u = User::newFromName( $this->mSearchUser );
+ if ( $u ) {
+ $this->mSearchUser = $u->getName(); // Username
normalisation
+ } elseif( IP::isIPAddress( $this->mSearchUser ) ) {
+ // It's an IP
+ $this->mSearchUser = IP::sanitizeIP( $this->mSearchUser
);
} else {
$this->mSearchUser = null;
}
@@ -207,7 +210,6 @@
$user = User::newFromName( $this->mSearchUser );
if ( !$user ) {
- $conds[] = 'afl_ip=afl_user_text';
$conds['afl_user'] = 0;
$conds['afl_user_text'] = $this->mSearchUser;
} else {
--
To view, visit https://gerrit.wikimedia.org/r/55826
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie331ec7ef3b461ae10f0e28fe50cb86684c6d3a0
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/AbuseFilter
Gerrit-Branch: master
Gerrit-Owner: Hoo man <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
