Merge "RemexCompatMunger: Don't call endTag() in case B/b" into REL1_31

diff --git a/includes/tidy/RemexCompatMunger.php b/includes/tidy/RemexCompatMunger.php
index ab2ba46..e6351e2 100644 (file)
--- a/includes/tidy/RemexCompatMunger.php
+++ b/includes/tidy/RemexCompatMunger.php
@@ -262,7 +262,6 @@ class RemexCompatMunger implements TreeHandler {
                        $pElement = $parentData->childPElement;
                        $parentData->childPElement = null;
                        $newRef = $refElement->userData;
-                       $this->endTag( $pElement, $sourceStart, 0 );
                } elseif ( $under && $parentData->isSplittable
                        && (bool)$parentData->ancestorPNode !== $inline
                ) {

diff --git a/tests/phpunit/includes/tidy/RemexDriverTest.php b/tests/phpunit/includes/tidy/RemexDriverTest.php
index b20557f..a5ebaa5 100644 (file)
--- a/tests/phpunit/includes/tidy/RemexDriverTest.php
+++ b/tests/phpunit/includes/tidy/RemexDriverTest.php
@@ -257,6 +257,11 @@ class RemexDriverTest extends MediaWikiTestCase {
                        '<i><blockquote>x</i></blockquote>',
                        '<i></i><blockquote><p><i>x</i></p></blockquote>',
                ],
+               [
+                       'p-wrap ended by reparenting (T200827)',
+                       '<i><blockquote><p></i>',
+                       '<i></i><blockquote><p><i></i></p><p><i></i></p></blockquote>',
+               ],
        ];
 
        public function provider() {