From b1baa56b84ec34191c14b835dbcd6734a784b585 Mon Sep 17 00:00:00 2001
From: Arlo Breault <abreault@wikimedia.org>
Date: Thu, 12 Jul 2018 14:31:04 -0400
Subject: [PATCH] <ins>/<del> elements can be phrasing or flow

The changes to the parserTests.txt highlight the differing opinions that
doBlockLevels and Remex had on whether these should be paragraph wrapped.

Since the only time they wouldn't have been was when found on a line
with other flow tags, this likely isn't a behaviour that was depended on
in practice.  And, indeed, the task describes this as a bug.

A sampling of pages from an insource:/\<(ins|del)\>/ search on wiki bears
this out.

Bug: T17491
Change-Id: I311da777a63aa3c45013f2cfc090be35a022497e
(cherry picked from commit 5a7f860b7859146d006d09c29f542be835165870)
---
 includes/tidy/RemexCompatMunger.php | 2 ++
 tests/parser/parserTests.txt        | 7 ++++++-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/includes/tidy/RemexCompatMunger.php b/includes/tidy/RemexCompatMunger.php
index 7cf7bbede6..ab2ba46de9 100644
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -28,6 +28,7 @@ class RemexCompatMunger implements TreeHandler {
 		"button" => true,
 		"cite" => true,
 		"code" => true,
+		"del" => true,
 		"dfn" => true,
 		"em" => true,
 		"font" => true,
@@ -35,6 +36,7 @@ class RemexCompatMunger implements TreeHandler {
 		"iframe" => true,
 		"img" => true,
 		"input" => true,
+		"ins" => true,
 		"kbd" => true,
 		"label" => true,
 		"legend" => true,
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index 679bb0a7de..451c50f5a8 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -2289,6 +2289,11 @@ Foo <del>bar</del> <ins>baz</ins> quux
 </p>
 </blockquote>
 
+!! html+tidy
+<blockquote>
+<p>Foo <del>bar</del> <ins>baz</ins> quux
+</p>
+</blockquote>
 !! end
 
 !! test
@@ -2301,7 +2306,7 @@ T17491: <ins>/<del> in blockquote (2)
 </blockquote>
 
 !! html+tidy
-<blockquote><p>Foo </p><del>bar</del> <ins>baz</ins><p> quux
+<blockquote><p>Foo <del>bar</del> <ins>baz</ins> quux
 </p></blockquote>
 !! end
 
-- 
2.20.1