From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 5 Mar 2009 06:00:08 +0000 (+0000)
Subject: (bug 17792) Hide DELETED_USER items
X-Git-Tag: 1.31.0-rc.0~42604
X-Git-Url: https://git.cyclocoop.org/%242?a=commitdiff_plain;h=e2e24bf7b90c3dcaf7c343e64c0d5beb85332f13;p=lhc%2Fweb%2Fwiklou.git

(bug 17792) Hide DELETED_USER items
---

diff --git a/includes/specials/SpecialContributions.php b/includes/specials/SpecialContributions.php
index 64c65692db..c018d4bfa7 100644
--- a/includes/specials/SpecialContributions.php
+++ b/includes/specials/SpecialContributions.php
@@ -384,6 +384,8 @@ class ContribsPager extends ReverseChronologicalPager {
 		list( $tables, $index, $userCond, $join_cond ) = $this->getUserCond();
 		
 		$conds = array_merge( $userCond, $this->getNamespaceCond() );
+		// Paranoia: avoid brute force searches (bug 17792)
+		$conds[] = 'rev_deleted & ' . Revision::DELETED_USER . ' = 0';
 		$join_cond['page'] = array( 'INNER JOIN', 'page_id=rev_page' );
 		
 		$queryInfo = array(
@@ -398,7 +400,8 @@ class ContribsPager extends ReverseChronologicalPager {
 			'join_conds' => $join_cond
 		);
 		
-		ChangeTags::modifyDisplayQuery( $queryInfo['tables'], $queryInfo['fields'], $queryInfo['conds'], $queryInfo['join_conds'], $this->tagFilter );
+		ChangeTags::modifyDisplayQuery( $queryInfo['tables'], $queryInfo['fields'], $queryInfo['conds'],
+			$queryInfo['join_conds'], $this->tagFilter );
 		
 		wfRunHooks( 'ContribsPager::getQueryInfo', array( &$this, &$queryInfo ) );
 		return $queryInfo;