wikimedia/mediawiki-extensions-DiscussionTools
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/DiscussionTools synced 2024-11-28 02:00:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use 'baserevid' instead of 'basetimestamp' for edit conflict detection

Browse source 
This has two benefits:
* Allows detecting a conflict if two edits are saved in the same second
* Doesn't ignore conflicts with yourself (T246726)

Depends-On: Id7565018f66860b5c2ba688777508db1b88700ae
Bug: T246726
Change-Id: I22eaa1af5692854870d31e08b171a070a2fda0de
This commit is contained in:
Bartosz Dziewoński 2020-03-09 18:45:28 +01:00
parent 6b91a57e15
commit 4e135c7f07
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/controller.js
View file

@ -168,7 +168,7 @@ function save( widget, parsoidData ) {
page: pageData.pageName, page: pageData.pageName,
oldid: pageData.oldId, oldid: pageData.oldId,
summary: summary, summary: summary,
basetimestamp: pageData.baseTimeStamp, baserevid: pageData.oldId,
starttimestamp: pageData.startTimeStamp, starttimestamp: pageData.startTimeStamp,
etag: pageData.etag, etag: pageData.etag,
assert: mw.user.isAnon() ? 'anon' : 'user', assert: mw.user.isAnon() ? 'anon' : 'user',
@ -302,7 +302,6 @@ function getParsoidCommentData( commentId ) {
parsoidPageData = { parsoidPageData = {
pageName: pageName, pageName: pageName,
oldId: oldId, oldId: oldId,
baseTimeStamp: data.basetimestamp,
startTimeStamp: data.starttimestamp, startTimeStamp: data.starttimestamp,
etag: data.etag etag: data.etag
}; };