jenkins-bot has submitted this change and it was merged.
Change subject: Use addQuotes() as needed in MergeHistory pager
......................................................................
Use addQuotes() as needed in MergeHistory pager
Change-Id: Ibf15ff303cf9641a0ce3da855a88d8276fb21ff1
---
M includes/specials/SpecialMergeHistory.php
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
CSteipp: Looks good to me, approved
jenkins-bot: Verified
diff --git a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index 6efc12b..492eb3b 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -496,7 +496,7 @@
/** @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 @@
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' ),
--
To view, visit https://gerrit.wikimedia.org/r/156731
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibf15ff303cf9641a0ce3da855a88d8276fb21ff1
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aaron Schulz <[email protected]>
Gerrit-Reviewer: CSteipp <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
