From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Sun, 2 Nov 2014 17:19:56 +0000 (+0100)
Subject: Parser: Add <bdi> to the whitelist for TOC links
X-Git-Tag: 1.31.0-rc.0~12851^2
X-Git-Url: http://git.cyclocoop.org//%27http:/code.google.com/p/ie7-js//%27?a=commitdiff_plain;h=e20e64eb6bd8b4c22491a1aebe2792618fd39ea2;p=lhc%2Fweb%2Fwiklou.git

Parser: Add <bdi> to the whitelist for TOC links

Bug: 72884
Change-Id: Id5aa9a4eb32fb185881141e55de700ae36f806c5
---

diff --git a/includes/parser/Parser.php b/includes/parser/Parser.php
index e3a4ea57eb..6b2444ebb5 100644
--- a/includes/parser/Parser.php
+++ b/includes/parser/Parser.php
@@ -4636,14 +4636,15 @@ class Parser {
 			# * <sup> and <sub> (bug 8393)
 			# * <i> (bug 26375)
 			# * <b> (r105284)
+			# * <bdi> (bug 72884)
 			# * <span dir="rtl"> and <span dir="ltr"> (bug 35167)
 			#
 			# We strip any parameter from accepted tags (second regex), except dir="rtl|ltr" from <span>,
 			# to allow setting directionality in toc items.
 			$tocline = preg_replace(
 				array(
-					'#<(?!/?(span|sup|sub|i|b)(?: [^>]*)?>).*?' . '>#',
-					'#<(/?(?:span(?: dir="(?:rtl|ltr)")?|sup|sub|i|b))(?: .*?)?' . '>#'
+					'#<(?!/?(span|sup|sub|bdi|i|b)(?: [^>]*)?>).*?' . '>#',
+					'#<(/?(?:span(?: dir="(?:rtl|ltr)")?|sup|sub|bdi|i|b))(?: .*?)?' . '>#'
 				),
 				array( '', '<$1>' ),
 				$safeHeadline
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index cf9d829975..7eb152ab8e 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -19043,6 +19043,22 @@ __TOC__
 
 !! end
 
+!! test
+Bug 72884: bdi element in ToC
+!! wikitext
+__TOC__
+== <bdi>test</bdi> ==
+!! html
+<div id="toc" class="toc"><div id="toctitle"><h2>Contents</h2></div>
+<ul>
+<li class="toclevel-1 tocsection-1"><a href="#test"><span class="tocnumber">1</span> <span class="toctext"><bdi>test</bdi></span></a></li>
+</ul>
+</div>
+
+<h2><span class="mw-headline" id="test"><bdi>test</bdi></span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=1" title="Edit section: test">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+
+!! end
+
 !! article
 MediaWiki:Bug32057
 !! text