dépôts
/
lhc
/
web
/
wiklou.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ac670cf
)
Special:MergeHistory: Merge all revisions if no particular box/button is ticked
author
Sethakill
<sethakill@outlook.com>
Tue, 14 Jun 2016 13:49:28 +0000
(15:49 +0200)
committer
Sethakill
<sethakill@outlook.com>
Tue, 14 Jun 2016 13:49:28 +0000
(15:49 +0200)
Bug: T137792
Change-Id: I78e7d476084f719031c1303e7bf9bf6e1d1fa84a
includes/specials/SpecialMergeHistory.php
patch
|
blob
|
history
diff --git
a/includes/specials/SpecialMergeHistory.php
b/includes/specials/SpecialMergeHistory.php
index
162ef60
..
058d1ce
100644
(file)
--- 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;