Page MenuHomePhabricator
Create Task
Maniphest T220067

Beta edit conflict tool apparently replaces HTML entities automatically
Closed, ResolvedPublic5 Estimated Story PointsBUG REPORT
Actions

Description

Steps to Reproduce:
Edit a page using the beta edit conflict tool. The page should contain HTML entities, like:

{ and |

The beta edit conflict tool appears to replace those entities with their actual characters, in this case { and | (left brace and pipe).

Actual Results:
Here's a diff that appears to show the results of the current replacements: https://en.wikipedia.org/w/index.php?diff=882571877

Expected Results:
This replacement, at least of these characters, should NOT happen. HTML entities are often deliberate, and replacement of them can cause unintended consequences, with the parser now having characters to interpret as wikicode.

See also this talk page discussion:
https://en.wikipedia.org/w/index.php?title=User_talk:Redrose64&curid=23591837&diff=890868687&oldid=890839616

My apologies if anything in this bug report is incorrect. I am reporting based on limited information.

Details

SubjectRepoBranchLines +/-
Remove unused boolean flag from …DiffFormatter::composeLines()mediawiki/extensions/TwoColConflictmaster+15 -28
Prevent HTML entities from being decoded automaticallymediawiki/extensions/TwoColConflictmaster+80 -40
Add missing test cases to LineBasedUnifiedDiffFormatterTestmediawiki/extensions/TwoColConflictmaster+70 -2
Customize query in gerrit

Related Objects

Event Timeline

Jonesey95 created this task.Apr 4 2019, 4:36 AM
Restricted Application added a project: TCB-Team (now WMDE-TechWish). · View Herald TranscriptApr 4 2019, 4:36 AM
Restricted Application added a subscriber: Aklapper. · View Herald Transcript
Pppery subscribed.Apr 4 2019, 11:46 AM
Amorymeltzer subscribed.Apr 4 2019, 6:28 PM
Izno subscribed.Apr 4 2019, 9:54 PM
WMDE-Fisch set the point value for this task to 5.Apr 24 2019, 9:58 AM
WMDE-Fisch added a project: WMDE-QWERTY-Sprint-2019-04-17.
Andrew-WMDE claimed this task.Apr 24 2019, 11:20 AM
Andrew-WMDE moved this task from Sprint Backlog to Doing on the WMDE-QWERTY-Sprint-2019-04-17 board.
gerritbot added a comment.Apr 24 2019, 12:52 PM

Change 506147 had a related patch set uploaded (by Andrew-WMDE; owner: Andrew-WMDE):
[mediawiki/extensions/TwoColConflict@master] Prevent HTML entities from being decoded automatically

https://gerrit.wikimedia.org/r/506147

gerritbot added a project: Patch-For-Review.Apr 24 2019, 12:52 PM
Andrew-WMDE mentioned this in rESCCcb4aef260869: Prevent HTML entities from being decoded automatically.Apr 24 2019, 12:59 PM
thiemowmde mentioned this in rESCCb9323bca0efa: Prevent HTML entities from being decoded automatically.Apr 24 2019, 1:15 PM
Andrew-WMDE moved this task from Doing to Review on the WMDE-QWERTY-Sprint-2019-04-17 board.Apr 24 2019, 1:44 PM
thiemowmde mentioned this in rESCCfb9835864f2c: Prevent HTML entities from being decoded automatically.Apr 25 2019, 11:57 AM
gerritbot added a comment.Apr 25 2019, 11:58 AM

Change 506391 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Remove unused boolean flag from …DiffFormatter::composeLines()

https://gerrit.wikimedia.org/r/506391

thiemowmde mentioned this in rESCCb7314407aa09: Remove unused boolean flag from …DiffFormatter::composeLines().Apr 25 2019, 12:01 PM
thiemowmde mentioned this in rESCC927a041e15b1: Remove unused boolean flag from …DiffFormatter::composeLines().Apr 25 2019, 12:45 PM
thiemowmde mentioned this in rESCC66b6da912daa: Remove unused boolean flag from …DiffFormatter::composeLines().Apr 25 2019, 1:35 PM
gerritbot added a comment.Apr 25 2019, 2:52 PM

Change 506447 had a related patch set uploaded (by Thiemo Kreuz (WMDE); owner: Thiemo Kreuz (WMDE)):
[mediawiki/extensions/TwoColConflict@master] Add missing test cases to LineBasedUnifiedDiffFormatterTest

https://gerrit.wikimedia.org/r/506447

thiemowmde mentioned this in rESCCcf2616480b03: Add missing test cases to LineBasedUnifiedDiffFormatterTest.Apr 25 2019, 2:55 PM
thiemowmde mentioned this in rESCC890a130f7fe8: Remove unused boolean flag from …DiffFormatter::composeLines().
thiemowmde mentioned this in rESCC25adbc3efe4e: Prevent HTML entities from being decoded automatically.Apr 25 2019, 3:07 PM
thiemowmde mentioned this in rESCC6e39b6d5369b: Prevent HTML entities from being decoded automatically.Apr 25 2019, 3:29 PM
thiemowmde mentioned this in rESCCfa7d4b41a819: Prevent HTML entities from being decoded automatically.Apr 25 2019, 4:14 PM
gerritbot added a comment.Apr 25 2019, 4:42 PM

Change 506447 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Add missing test cases to LineBasedUnifiedDiffFormatterTest

https://gerrit.wikimedia.org/r/506447

ReleaseTaggerBot added a project: MW-1.34-notes (1.34.0-wmf.3; 2019-04-30).Apr 25 2019, 5:00 PM
Pppery removed a project: Patch-For-Review.Apr 25 2019, 6:53 PM
Pppery added a project: Patch-For-Review.
Pppery unsubscribed.
thiemowmde mentioned this in rESCC73cef10739dd: Remove unused boolean flag from …DiffFormatter::composeLines().Apr 26 2019, 8:07 AM
thiemowmde mentioned this in rESCC22df89a9ea84: Remove unused boolean flag from …DiffFormatter::composeLines().Apr 26 2019, 8:21 AM
gerritbot added a comment.Apr 26 2019, 10:12 AM

Change 506147 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Prevent HTML entities from being decoded automatically

https://gerrit.wikimedia.org/r/506147

gerritbot added a comment.Apr 26 2019, 1:04 PM

Change 506391 merged by jenkins-bot:
[mediawiki/extensions/TwoColConflict@master] Remove unused boolean flag from …DiffFormatter::composeLines()

https://gerrit.wikimedia.org/r/506391

WMDE-Fisch moved this task from Review to Demo on the WMDE-QWERTY-Sprint-2019-04-17 board.Apr 26 2019, 5:16 PM
Tobi_WMDE_SW moved this task from Backlog to Tickets in sprint on the Two-Column-Edit-Conflict-Merge board.May 3 2019, 11:36 AM
Lea_WMDE closed this task as Resolved.May 8 2019, 9:03 AM
Lea_WMDE moved this task from Demo to Done on the WMDE-QWERTY-Sprint-2019-04-17 board.
Pppery removed a project: Patch-For-Review.Aug 2 2019, 6:37 PM
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL