Skip to content

Commit

Permalink
tag: Fix regression leaving generic {{merge}} instead of {{merge to}}…
Browse files Browse the repository at this point in the history
… or {{merge from}}

As reported at [WT:TW](https://en.wikipedia.org/w/index.php?oldid=918480329#Merge_tags), Twinkle has been leaving `{{merge}}` on the other page when tagging with `{{merge to}}` or `{{merge from}}` (rather than `{{merge from}}` or `{{merge to}}`, respectively).

Stems from #485, where somewhere along the way the addition in [L1274](95eac79#diff-03744d176dfd1e8a2178545886a87644R1606) at 95eac79 was removed but `params.mergeTag` remained.
  • Loading branch information
Amorymeltzer committed Sep 30, 2019
1 parent bab8522 commit 743e821
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions modules/friendlytag.js
Original file line number Diff line number Diff line change
Expand Up @@ -1523,6 +1523,7 @@ Twinkle.tag.callbacks = {
case 'Merge':
case 'Merge to':
case 'Merge from':
params.mergeTag = tagName;
if (params.mergeTarget) {
// normalize the merge target for now and later
params.mergeTarget = Morebits.string.toUpperCaseFirstChar(params.mergeTarget.replace(/_/g, ' '));
Expand Down

0 comments on commit 743e821

Please sign in to comment.