Merge "Improve RemexStripTagHandler working with tables"

diff --git a/includes/parser/RemexStripTagHandler.php b/includes/parser/RemexStripTagHandler.php
index bf4c098..2d75c86 100644 (file)
--- a/includes/parser/RemexStripTagHandler.php
+++ b/includes/parser/RemexStripTagHandler.php
@@ -87,7 +87,10 @@ class RemexStripTagHandler implements TokenHandler {
                'pre' => true,
                'section' => true,
                'table' => true,
+               'td' => true,
                'tfoot' => true,
+               'th' => true,
+               'tr' => true,
                'ul' => true,
                'video' => true,
        ];

diff --git a/tests/phpunit/includes/parser/SanitizerTest.php b/tests/phpunit/includes/parser/SanitizerTest.php
index ad8aa1e..1f6f4e8 100644 (file)
--- a/tests/phpunit/includes/parser/SanitizerTest.php
+++ b/tests/phpunit/includes/parser/SanitizerTest.php
@@ -527,6 +527,7 @@ class SanitizerTest extends MediaWikiTestCase {
                        ],
                        [ '1<span class="<?php">2</span>3', '123' ],
                        [ '1<span class="<?">2</span>3', '123' ],
+                       [ '<th>1</th><td>2</td>', '1 2' ],
                ];
        }