Aaron Schulz has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/353006 )
Change subject: Avoid postgres CategoryMembershipChangeTest failures
......................................................................
Avoid postgres CategoryMembershipChangeTest failures
Strip out the redundant /32 CIDR suffix from the IP.
Bug: T75174
Change-Id: If7738ab46c72babb51d3c306ce749a9ccfe34740
---
M includes/changes/RecentChange.php
1 file changed, 7 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/06/353006/1
diff --git a/includes/changes/RecentChange.php
b/includes/changes/RecentChange.php
index 35f8b3b..8819bfa 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -911,7 +911,13 @@
public function loadFromRow( $row ) {
$this->mAttribs = get_object_vars( $row );
$this->mAttribs['rc_timestamp'] = wfTimestamp( TS_MW,
$this->mAttribs['rc_timestamp'] );
- $this->mAttribs['rc_deleted'] = $row->rc_deleted; // MUST be set
+ // Clean up CIDRs for postgres
+ $n = strpos( $this->mAttribs['rc_ip'], '/' );
+ if ( $n !== false ) {
+ $this->mAttribs['rc_ip'] = substr(
$this->mAttribs['rc_ip'], 0, $n );
+ }
+ // rc_deleted MUST be set
+ $this->mAttribs['rc_deleted'] = $row->rc_deleted;
}
/**
--
To view, visit https://gerrit.wikimedia.org/r/353006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If7738ab46c72babb51d3c306ce749a9ccfe34740
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
