The merge message, when two users edit the same topic, should be cleaned up.
1. PARAM 2 is wrong as
within User.pm returns:
which results in:
2. There is no regular way to continue except showing the differences of the merge. At least there should be a way to simply go to the topic view.
Nr. 2 seems to be a general issue. Most messages miss the [OK] button to go back to the topic. (Although there are messages where there should not be an [OK] button to let users go back to the previous screen.)
In interest of getting eventual conflicts resolved asap, I think a link to diffs is the best link to offer under all circumstances.
Regarding missing OK buttons, TestCaseOopsAttention
/ Alerts has a list of user messages, feel free to create proper patches
OK button added to merge_notice.
ok, number 1 just looks odd because you are using WikiName
as usename, and because I suspect that stringify was not really intended to be called when the user sees it. I'm not going to change the code now :()
To solve (2) there should be called another Method, so that the user sees the right name.
merged in 9214
Closed with release of 4.0.2