Page MenuHomePhabricator

Can't save edit via edit conflict resolution form
Open, Needs TriagePublic

Description

Setup: MediaWiki 1.31, PHP 7.2.14 (fpm-fcgi), MySQL 5.5.62-log (InnoDB), ICU 50.1.2

How to reproduce:

  1. Open a page in the editor
  2. Another user opens the same page in the editor, edits and saves it
  3. edit the page, and try to save it, so that the edit conflict form pops up
  4. after resolving the edit conflict click the 'save' button

Result
The edit conflict resolution form gets loaded again, your edit doesn't get saved.

Expected Result
Your edit gets saved and the article page gets loaded

Additional Information
Reproduced the bug on machines with Firefox 64/ubuntu 16.4 LTS, Firefox 65/Windows 8.1 and Google Chrome/Windows 8.1. Skin was a basic Vector with no notable modifications, and the bug always occurs, the only way to save after an edit conflict occurred is by opening the article in question in the editor again and copy the changed wikicode into the editor.
URL to the wiki I encountered the bug: https://mariowiki.net

Event Timeline

I have the same issue. Do you have any solution or work-around about this? Thank you

We had the same problem. It would detect the conflict, but not let us save it after manually merging. We had to change from backslashes to slashes in our "$wgDiff3 = …" line. That fixed it. (Version 1.31.0; Windows 2012 R2 server; Windows 10 client; Edge browser.)

Edit: Decided my bug is different so I gave it its own ticket: T313152

Novem_Linguae renamed this task from Can't save edit via edit conflict resolution form to Can't save edit, infinite edit conflicts.Jul 16 2022, 6:58 AM
Novem_Linguae renamed this task from Can't save edit, infinite edit conflicts to Can't save edit via edit conflict resolution form.Jul 16 2022, 7:13 AM