From 515f0a30e2f27aa6b23f918fa0a43fc5e55cfaa6 Mon Sep 17 00:00:00 2001 From: Aaron Schulz Date: Wed, 27 Aug 2014 16:49:34 -0700 Subject: [PATCH] Use addQuotes() as needed in MergeHistory pager Change-Id: Ibf15ff303cf9641a0ce3da855a88d8276fb21ff1 --- includes/specials/SpecialMergeHistory.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php index 6efc12b391..492eb3b5b1 100644 --- a/includes/specials/SpecialMergeHistory.php +++ b/includes/specials/SpecialMergeHistory.php @@ -496,7 +496,7 @@ class MergeHistoryPager extends ReverseChronologicalPager { /** @var array */ public $mConds; - function __construct( $form, $conds = array(), $source, $dest ) { + function __construct( $form, $conds, $source, $dest ) { $this->mForm = $form; $this->mConds = $conds; $this->title = $source; @@ -550,7 +550,7 @@ class MergeHistoryPager extends ReverseChronologicalPager { function getQueryInfo() { $conds = $this->mConds; $conds['rev_page'] = $this->articleID; - $conds[] = "rev_timestamp < {$this->maxTimestamp}"; + $conds[] = "rev_timestamp < " . $this->mDb->addQuotes( $this->maxTimestamp ); return array( 'tables' => array( 'revision', 'page', 'user' ), -- 2.20.1