Going through a successful conflict resolution causes the original "oldid" parameter to be returned to EditPage, and this triggers setPostEditCookie to display the "restored" notification. This should only happen after undeleting. After a successful resolution, we can simply use the "saved" notification.
I'll submit a small patch according to my understanding of the code (aka, probably wrong ;-)
| Subject | Repo | Branch | Lines +/- | |
|---|---|---|---|---|
| Show "saved" notification after conflict resolution | mediawiki/core | master | +4 -1 |
@awight: Please add code base project tags and not only team tags, so someone else can understand which code base(s) this is about. Thanks!
Change 572210 had a related patch set uploaded (by Awight; owner: Awight):
[mediawiki/core@master] Show "saved" notification after conflict resolution
This is really strange, but now I get a "Your edit was saved" notification on betawiki, and not the "restored" message. I don't see what I'm doing differently.
I just got "restored", then "saved" one after another when going through the steps to reproduce. 🌵
@AMooney, I understand that code review is in progress for this ticket, but there's no one assigned to it. Should it be moved back to Code Review Needed?
Change 572210 abandoned by Awight:
[mediawiki/core@master] Show "saved" notification after conflict resolution
Reason:
Haven't been able to reproduce the problem.