From: Tim Starling <tstarling@users.mediawiki.org>
Date: Wed, 30 Dec 2009 08:01:17 +0000 (+0000)
Subject: Fix for r58197, removed unnecessary array_merge()
X-Git-Tag: 1.31.0-rc.0~38455
X-Git-Url: http://git.cyclocoop.org/%7B%24admin_url%7Dmembres/Category:Foo?a=commitdiff_plain;h=c8c298210865216a3133d7a005d46f2877fbe410;p=lhc%2Fweb%2Fwiklou.git

Fix for r58197, removed unnecessary array_merge()
---

diff --git a/includes/HistoryPage.php b/includes/HistoryPage.php
index ebbc400334..1e1a5a43d3 100644
--- a/includes/HistoryPage.php
+++ b/includes/HistoryPage.php
@@ -319,7 +319,7 @@ class HistoryPager extends ReverseChronologicalPager {
 	function getQueryInfo() {
 		$queryInfo = array(
 			'tables'  => array('revision'),
-			'fields'  => array_merge( Revision::selectFields()),
+			'fields'  => Revision::selectFields(),
 			'conds'   => array_merge( array('rev_page' => $this->historyPage->title->getArticleID() ), $this->conds ),
 			'options' => array( 'USE INDEX' => array('revision' => 'page_timestamp') ),
 			'join_conds' => array( 'tag_summary' => array( 'LEFT JOIN', 'ts_rev_id=rev_id' ) ),