From: jenkins-bot <jenkins-bot@gerrit.wikimedia.org>
Date: Thu, 31 Aug 2017 21:02:12 +0000 (+0000)
Subject: Merge "Move section ID fallbacks into headers themselves"
X-Git-Tag: 1.31.0-rc.0~2245
X-Git-Url: https://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=802c199d0bd80ff0f4d730c61fd58cbf08a52d8d;hp=-c

Merge "Move section ID fallbacks into headers themselves"
---

802c199d0bd80ff0f4d730c61fd58cbf08a52d8d
diff --combined includes/Linker.php
index d55f0e0bb5,33e30c9b24..aedb704a8f
--- a/includes/Linker.php
+++ b/includes/Linker.php
@@@ -154,11 -154,6 +154,11 @@@ class Linker 
  	 * @since 1.16.3
  	 * @deprecated since 1.28, use MediaWiki\Linker\LinkRenderer instead
  	 * @see Linker::link
 +	 * @param Title $target
 +	 * @param string $html
 +	 * @param array $customAttribs
 +	 * @param array $query
 +	 * @param string|array $options
  	 * @return string
  	 */
  	public static function linkKnown(
@@@ -1355,7 -1350,7 +1355,7 @@@
  	/**
  	 * @param Title $contextTitle
  	 * @param string $target
 -	 * @param string $text
 +	 * @param string &$text
  	 * @return string
  	 */
  	public static function normalizeSubpageLink( $contextTitle, $target, &$text ) {
@@@ -1624,14 -1619,16 +1624,16 @@@
  		$link, $fallbackAnchor = false
  	) {
  		$anchorEscaped = htmlspecialchars( $anchor );
- 		$ret = "<h$level$attribs"
- 			. "<span class=\"mw-headline\" id=\"$anchorEscaped\">$html</span>"
- 			. $link
- 			. "</h$level>";
+ 		$fallback = '';
  		if ( $fallbackAnchor !== false && $fallbackAnchor !== $anchor ) {
  			$fallbackAnchor = htmlspecialchars( $fallbackAnchor );
- 			$ret = "<div id=\"$fallbackAnchor\"></div>$ret";
+ 			$fallback = "<span id=\"$fallbackAnchor\"></span>";
  		}
+ 		$ret = "<h$level$attribs"
+ 			. "$fallback<span class=\"mw-headline\" id=\"$anchorEscaped\">$html</span>"
+ 			. $link
+ 			. "</h$level>";
+ 
  		return $ret;
  	}
  
diff --combined tests/parser/parserTests.txt
index 2fa3cb05d0,82d195a653..02051658ae
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@@ -15807,26 -15807,6 +15807,26 @@@ parsoid=wt2htm
  <link rel="mw:PageProp/Category" href="./Category:Baz" data-parsoid='{"stx":"simple","a":{"href":"./Category:Baz"},"sa":{"href":"Category:Baz"}}'/>
  !! end
  
 +!! test
 +9. Categories and newlines: should behave properly with linkprefix (T87753)
 +!! options
 +language=ar
 +!! wikitext
 +foo bar
 +foo bar
 +[[تصنيف:Foo]]
 +[[تصنيف:Bar]]
 +!! html/php
 +<p>foo bar
 +foo bar
 +</p>
 +!! html/parsoid
 +<p>foo bar
 +foo bar</p>
 +<link rel="mw:PageProp/Category" href="./تصنيف:Foo"/>
 +<link rel="mw:PageProp/Category" href="./تصنيف:Bar"/>
 +!! end
 +
  !! test
  Category links with multiple namespaces
  !! wikitext
@@@ -15874,20 -15854,6 +15874,20 @@@ x[[Category:Foo]]
  <p>x<link rel="mw:PageProp/Category" href="./Flokkur:Foo" data-parsoid=""/>y</p>
  !! end
  
 +!! test
 +Link prefix/suffixes aren't applied to language links
 +!! options
 +parsoid=wt2html
 +language=is
 +!! wikitext
 +x[[es:Foo]]y
 +!! html/php
 +<p>xy
 +</p>
 +!! html/parsoid
 +<p>x<link rel="mw:PageProp/Language" href="http://es.wikipedia.org/wiki/Foo" data-parsoid=""/>y</p>
 +!! end
 +
  !! test
  Parsoid: Serialize link to file page with colon escape
  !! options
@@@ -28458,10 -28424,10 +28458,10 @@@ wgFragmentMode=[ 'html5', 'legacy' 
  
  <h2><span class="mw-headline" id="Foo_bar">Foo bar</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: Foo bar">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
  <h2><span class="mw-headline" id="foo_Bar_2">foo Bar</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: foo Bar">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id=".D0.A2.D0.B5.D1.81.D1.82"></div><h2><span class="mw-headline" id="Тест">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id=".D0.A2.D0.B5.D1.81.D1.82_2"></div><h2><span class="mw-headline" id="Тест_2">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id=".D1.82.D0.B5.D1.81.D1.82"></div><h2><span class="mw-headline" id="тест">тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id="Hey_.3C_.23_.22_.3E_.25_:_.27"></div><h2><span class="mw-headline" id="Hey_&lt;_#_&quot;_&gt;_%_:_'">Hey &lt; # " &gt;&#160;%&#160;: '</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Hey &lt; # &quot; &gt; % : '">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id=".D0.A2.D0.B5.D1.81.D1.82"></span><span class="mw-headline" id="Тест">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id=".D0.A2.D0.B5.D1.81.D1.82_2"></span><span class="mw-headline" id="Тест_2">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id=".D1.82.D0.B5.D1.81.D1.82"></span><span class="mw-headline" id="тест">тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id="Hey_.3C_.23_.22_.3E_.25_:_.27"></span><span class="mw-headline" id="Hey_&lt;_#_&quot;_&gt;_%_:_'">Hey &lt; # " &gt;&#160;%&#160;: '</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Hey &lt; # &quot; &gt; % : '">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
  <p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a href="#%D0%A2%D0%B5%D1%81%D1%82">#Тест</a> <a href="#%D1%82%D0%B5%D1%81%D1%82">#тест</a> <a href="#Hey_%3C_%23_%22_%3E_%25_:_%27">#Hey &lt; # " &gt;&#160;%&#160;: '</a>
  </p><p>%F0%9F%92%A9 <span id="%F0%9F%92%A9"></span>
  </p><p><a href="#%E5%95%A4%E9%85%92">#啤酒</a> <a href="#%E5%95%A4%E9%85%92">#啤酒</a>
@@@ -28505,10 -28471,10 +28505,10 @@@ wgFragmentMode=[ 'legacy', 'html5' 
  
  <h2><span class="mw-headline" id="Foo_bar">Foo bar</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: Foo bar">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
  <h2><span class="mw-headline" id="foo_Bar_2">foo Bar</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=2" title="Edit section: foo Bar">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id="Тест"></div><h2><span class="mw-headline" id=".D0.A2.D0.B5.D1.81.D1.82">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id="Тест_2"></div><h2><span class="mw-headline" id=".D0.A2.D0.B5.D1.81.D1.82_2">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id="тест"></div><h2><span class="mw-headline" id=".D1.82.D0.B5.D1.81.D1.82">тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
- <div id="Hey_&lt;_#_&quot;_&gt;_%_:_'"></div><h2><span class="mw-headline" id="Hey_.3C_.23_.22_.3E_.25_:_.27">Hey &lt; # " &gt;&#160;%&#160;: '</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Hey &lt; # &quot; &gt; % : '">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id="Тест"></span><span class="mw-headline" id=".D0.A2.D0.B5.D1.81.D1.82">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=3" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id="Тест_2"></span><span class="mw-headline" id=".D0.A2.D0.B5.D1.81.D1.82_2">Тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=4" title="Edit section: Тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id="тест"></span><span class="mw-headline" id=".D1.82.D0.B5.D1.81.D1.82">тест</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=5" title="Edit section: тест">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
+ <h2><span id="Hey_&lt;_#_&quot;_&gt;_%_:_'"></span><span class="mw-headline" id="Hey_.3C_.23_.22_.3E_.25_:_.27">Hey &lt; # " &gt;&#160;%&#160;: '</span><span class="mw-editsection"><span class="mw-editsection-bracket">[</span><a href="/index.php?title=Parser_test&amp;action=edit&amp;section=6" title="Edit section: Hey &lt; # &quot; &gt; % : '">edit</a><span class="mw-editsection-bracket">]</span></span></h2>
  <p><a href="#Foo_bar">#Foo bar</a> <a href="#foo_Bar">#foo Bar</a> <a href="#.D0.A2.D0.B5.D1.81.D1.82">#Тест</a> <a href="#.D1.82.D0.B5.D1.81.D1.82">#тест</a> <a href="#Hey_.3C_.23_.22_.3E_.25_:_.27">#Hey &lt; # " &gt;&#160;%&#160;: '</a>
  </p><p>.F0.9F.92.A9 <span id=".F0.9F.92.A9"></span>
  </p><p><a href="#.E5.95.A4.E9.85.92">#啤酒</a> <a href="#.E5.95.A4.E9.85.92">#啤酒</a>