From: Aaron Schulz <aaron@users.mediawiki.org>
Date: Thu, 13 Nov 2008 07:58:42 +0000 (+0000)
Subject: Fix
X-Git-Tag: 1.31.0-rc.0~44357
X-Git-Url: http://git.cyclocoop.org//%27%40script%40/%27?a=commitdiff_plain;h=8c72ef676440f1cd9a6e2bc5b9583c5c662673d3;p=lhc%2Fweb%2Fwiklou.git

Fix
---

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 683b236421..80bf66ef90 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -434,7 +434,7 @@ class MergeHistoryPager extends ReverseChronologicalPager {
 	function getQueryInfo() {
 		$conds = $this->mConds;
 		$conds['rev_page'] = $this->articleID;
-		$conds['page_id'] = 'rev_page';
+		$conds[] = 'page_id = rev_page';
 		$conds[] = "rev_timestamp < {$this->maxTimestamp}";
 		return array(
 			'tables' => array('revision','page'),