Item5553: Topic merge oops message parameters are buggy
Priority: Normal
Current State: No Action Required
Released In: n/a
Target Release: n/a
Applies To: Engine
Component: Merge
Branches:
The parameters
PARAM1 to
PARAM3 supplied to the
merge_notice template in
messages.tmpl are wrong in two ways:
- PARAM2 contains the login name (in our case the UNIX uname) and not the WikiName of the other user that saved the topic
- PARAM1 and PARAM3 are both set to the same revision if the 'workflow' is the following:
- User 1 edits topic
- User 2 edits same topic and chooses Edit Anyway
- User 1 saves his changes which will become rev n
- User 2 saves his changes and gets the topic merged oops for rev n to rev n.
The attached patch will resolve the first issue. I could not easily identify a fix for the second issue.
--
TWiki:Main/StefanWalter - 21 Apr 2008
I've applied the patch to 4.2 branch and MAIN - thanks
still need to work on part 2
--
TWiki:Main.SvenDowideit - 22 Apr 2008
Fixed in a recent task on trunk. Setting to No Action
--
GeorgeClark - 12 Jan 2015