X-Git-Url: http://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2Fchanges%2FRecentChange.php;h=e8e35a38391a2a8a47912d9e0a5a5ff0c5a47c74;hb=eaefbf99c8183f543c766272fc1a73480d28e004;hp=35f8b3b95ed1f8b64b8766dc1f492b22d4db2af3;hpb=a9ea3a3ee9d5655ea2bd4638ad77e6ecc1d4a430;p=lhc%2Fweb%2Fwiklou.git

diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php
index 35f8b3b95e..e8e35a3839 100644
--- a/includes/changes/RecentChange.php
+++ b/includes/changes/RecentChange.php
@@ -911,7 +911,16 @@ class RecentChange {
 	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
+		// rc_deleted MUST be set
+		$this->mAttribs['rc_deleted'] = $row->rc_deleted;
+
+		if ( isset( $this->mAttribs['rc_ip'] ) ) {
+			// Clean up CIDRs for Postgres per T164898. ("127.0.0.1" casts to "127.0.0.1/32")
+			$n = strpos( $this->mAttribs['rc_ip'], '/' );
+			if ( $n !== false ) {
+				$this->mAttribs['rc_ip'] = substr( $this->mAttribs['rc_ip'], 0, $n );
+			}
+		}
 	}
 
 	/**