Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(bug 27679) Broken embedded files with special characters are no longer double HTML escaped

Browse source 
Was a double escape in Linker::makeBrokenImageLinkObj. I checked the callers and other usages in the function and $prefix and $inside appear to be assumed HTML fragments
Added parser tests: Passed 622 of 624 tests (99.68%)... 2 tests failed! Those two tests already failed for me before this patch
This commit is contained in:
Bryan Tong Minh 2011-02-26 12:08:59 +00:00
parent e4c31083f1
commit bf067d3395
3 changed files with 29 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
RELEASE-NOTES
View file

@ -142,6 +142,9 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
* (bug 15905) Nostalgia skin could become more usable by including a Talk:
link at the top of the page
* (bug 27560) Search queries no longer fail in walloon language
* (bug 27679) Broken embedded files with special characters longer double HTML
escaped
=== API changes in 1.18 ===
* (bug 26339) Throw warning when truncating an overlarge API result

8
includes/Linker.php
View file

@ -686,10 +686,10 @@ class Linker {
* Make a "broken" link to an image
*
* @param $title Title object
* @param $text String: link label
* @param $text String: link label in unescaped text form
* @param $query String: query string
* @param $trail String: link trail
* @param $prefix String: link prefix
* @param $trail String: link trail (HTML fragment)
* @param $prefix String: link prefix (HTML fragment)
* @param $time Boolean: a file of a certain timestamp was requested
* @return String
*/
@ -716,7 +716,7 @@ class Linker {
wfProfileOut( __METHOD__ );
return '<a href="' . htmlspecialchars( $href ) . '" class="new" title="' .
htmlspecialchars( $title->getPrefixedText(), ENT_QUOTES ) . '">' .
htmlspecialchars( $prefix . $text . $inside, ENT_NOQUOTES ) . '</a>' . $trail;
"$prefix$text$inside</a>$trail";
} else {
wfProfileOut( __METHOD__ );
return $this->linkKnown( $title, "$prefix$text$inside", array(), $query ) . $trail;

22
tests/parser/parserTests.txt
View file

@ -8422,6 +8422,28 @@ percent-encoding and + signs in internal links (Bug 26410)
</p>
!! end
!! test
Special characters in embedded file links (bug 27679)
!! input
[[File:Contains & ampersand.jpg]]
[[File:Does not exist.jpg|Title with & ampersand]]
!! result
<p><a href="/index.php?title=Special:Upload&amp;wpDestFile=Contains_%26_ampersand.jpg" class="new" title="File:Contains &amp; ampersand.jpg">File:Contains &amp; ampersand.jpg</a>
<a href="/index.php?title=Special:Upload&amp;wpDestFile=Does_not_exist.jpg" class="new" title="File:Does not exist.jpg">Title with &amp; ampersand</a>
</p>
!! end
!! test
Special characters in embedded file links (bug 27679)
!! input
[[File:Contains & ampersand.jpg]]
[[File:Does not exist.jpg|Title with & ampersand]]
!! result
<p><a href="/index.php?title=Special:Upload&amp;wpDestFile=Contains_%26_ampersand.jpg" class="new" title="File:Contains &amp; ampersand.jpg">File:Contains &amp; ampersand.jpg</a>
<a href="/index.php?title=Special:Upload&amp;wpDestFile=Does_not_exist.jpg" class="new" title="File:Does not exist.jpg">Title with &amp; ampersand</a>
</p>
!! end
TODO:
more images
more tables