From: Sethakill <sethakill@outlook.com>
Date: Tue, 14 Jun 2016 13:49:28 +0000 (+0200)
Subject: Special:MergeHistory: Merge all revisions if no particular box/button is ticked
X-Git-Tag: 1.31.0-rc.0~6487^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=475e78c377f81a8837462852cdaab05e01cd686c;p=lhc%2Fweb%2Fwiklou.git

Special:MergeHistory: Merge all revisions if no particular box/button is ticked

Bug: T137792
Change-Id: I78e7d476084f719031c1303e7bf9bf6e1d1fa84a
---

diff --git a/includes/specials/SpecialMergeHistory.php b/includes/specials/SpecialMergeHistory.php
index 162ef60d8f..058d1ced46 100644
--- a/includes/specials/SpecialMergeHistory.php
+++ b/includes/specials/SpecialMergeHistory.php
@@ -80,8 +80,7 @@ class SpecialMergeHistory extends SpecialPage {
 		$this->mTargetObj = $targetObj;
 		$this->mDestObj = $destObj;
 
-		if ( $opts->getValue( 'merge' ) && $targetObj &&
-			$destObj && $opts->getValue( 'mergepoint' ) !== '' ) {
+		if ( $opts->getValue( 'merge' ) && $targetObj && $destObj ) {
 			$this->merge();
 
 			return;