encLink-1.19.patch
Public
Actions

Authored By

	• bzimport
	Nov 22 2014, 12:44 AM

Size

3 KB

Referenced Files

None

Subscribers

None

encLink-1.19.patch
View Options

	--- a/includes/Linker.php
	+++ a/includes/Linker.php
	@@ -781,31 +781,31 @@ class Linker {
	* Make a "broken" link to an image
	*
	* @param $title Title object
	- * @param $html String: link label in htmlescaped text form
	+ * @param $label String: link label (plain text)
	* @param $query String: query string
	- * @param $trail String: link trail (HTML fragment)
	- * @param $prefix String: link prefix (HTML fragment)
	+ * @param $unused1 Unused parameter kept for b/c
	+ * @param $unused2 Unused parameter kept for b/c
	* @param $time Boolean: a file of a certain timestamp was requested
	* @return String
	*/
	- public static function makeBrokenImageLinkObj( $title, $html = '', $query = '', $trail = '', $prefix = '', $time = false ) {
	+ public static function makeBrokenImageLinkObj( $title, $label = '', $query = '', $unused1 = '', $unused2 = '', $time = false ) {
	global $wgEnableUploads, $wgUploadMissingFileUrl, $wgUploadNavigationUrl;
	if ( ! $title instanceof Title ) {
	- return "<!-- ERROR -->{$prefix}{$html}{$trail}";
	+ return "<!-- ERROR -->" . htmlspecialchars( $label );
	}
	wfProfileIn( __METHOD__ );
	+ if ( $label == '' ) {
	+ $label = $title->getPrefixedText();
	+ }
	+ $encLabel = htmlspecialchars( $label );
	$currentExists = $time ? ( wfFindFile( $title ) != false ) : false;

	- list( $inside, $trail ) = self::splitTrail( $trail );
	- if ( $html == '' )
	- $html = htmlspecialchars( $title->getPrefixedText() );
	-
	if ( ( $wgUploadMissingFileUrl \|\| $wgUploadNavigationUrl \|\| $wgEnableUploads ) && !$currentExists ) {
	$redir = RepoGroup::singleton()->getLocalRepo()->checkRedirect( $title );

	if ( $redir ) {
	wfProfileOut( __METHOD__ );
	- return self::linkKnown( $title, "$prefix$html$inside", array(), $query ) . $trail;
	+ return self::linkKnown( $title, $encLabel, array(), wfCgiToArray( $query ) );
	}

	$href = self::getUploadUrl( $title, $query );
	@@ -813,10 +813,10 @@ class Linker {
	wfProfileOut( __METHOD__ );
	return '<a href="' . htmlspecialchars( $href ) . '" class="new" title="' .
	htmlspecialchars( $title->getPrefixedText(), ENT_QUOTES ) . '">' .
	- "$prefix$html$inside</a>$trail";
	+ $encLabel . '</a>';
	} else {
	wfProfileOut( __METHOD__ );
	- return self::linkKnown( $title, "$prefix$html$inside", array(), $query ) . $trail;
	+ return self::linkKnown( $title, $encLabel, array(), wfCgiToArray( $query ) );
	}
	}

	--- a/tests/parser/parserTests.txt
	+++ a/tests/parser/parserTests.txt
	@@ -1733,6 +1733,21 @@ Link with double quotes in title part (literal) and alternate part (interpreted)
	!! end

	!! test
	+Broken image links with HTML captions (bug 39700)
	+!! input
	+[[File:Nonexistent\|<script></script>]]
	+[[File:Nonexistent\|100px\|<script></script>]]
	+[[File:Nonexistent\|<]]
	+[[File:Nonexistent\|a<i>b</i>c]]
	+!! result
	+<p><a href="/index.php?title=Special:Upload&wpDestFile=Nonexistent" class="new" title="File:Nonexistent"><script></script></a>
	+<a href="/index.php?title=Special:Upload&wpDestFile=Nonexistent" class="new" title="File:Nonexistent"><script></script></a>
	+<a href="/index.php?title=Special:Upload&wpDestFile=Nonexistent" class="new" title="File:Nonexistent"><</a>
	+<a href="/index.php?title=Special:Upload&wpDestFile=Nonexistent" class="new" title="File:Nonexistent">abc</a>
	+</p>
	+!! end
	+
	+!! test
	Plain link to URL
	!! input
	[[http://www.example.com]]

File Metadata

Mime Type: text/x-diff
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 9068
Default Alt Text: encLink-1.19.patch (3 KB)

encLink-1.19.patchPublicActions

encLink-1.19.patchView Options

File Metadata

Event Timeline

encLink-1.19.patch
Public
Actions

encLink-1.19.patch
View Options