From: Raimond Spekking <raymond@users.mediawiki.org>
Date: Tue, 23 Dec 2008 11:59:37 +0000 (+0000)
Subject: * (bug 13835) Fix rendering of {{filepath:Wiki.png|nowiki}}
X-Git-Tag: 1.31.0-rc.0~43827
X-Git-Url: http://git.cyclocoop.org/%22.%24h.%22?a=commitdiff_plain;h=566145e89b1f451636e02763381348db1198bc5e;p=lhc%2Fweb%2Fwiklou.git

* (bug 13835) Fix rendering of {{filepath:Wiki.png|nowiki}}
Patch by Olaf Lenz
---

diff --git a/CREDITS b/CREDITS
index f1adc6fd4a..9a51f84d02 100644
--- a/CREDITS
+++ b/CREDITS
@@ -71,6 +71,7 @@ following names for their contribution to the product.
 * Mormegil
 * Nathan Larson
 * Nikolaos S. Karastathis
+* Olaf Lenz
 * Paul Copperman
 * RememberTheDot
 * ST47
diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 5b7fff3654..cc262f22fd 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -446,7 +446,7 @@ The following extensions are migrated into MediaWiki 1.14:
 * (bug 16026) revision-info, revision-info-current, cannotdelete,
   redirectedfrom and historywarning messages now use Wiki text rather than raw
   HTML markup
-
+* (bug 13835) Fix rendering of {{filepath:Wiki.png|nowiki}}
 
 === API changes in 1.14 ===
 
diff --git a/includes/parser/CoreParserFunctions.php b/includes/parser/CoreParserFunctions.php
index 8fec0ab78c..05b4fe97b9 100644
--- a/includes/parser/CoreParserFunctions.php
+++ b/includes/parser/CoreParserFunctions.php
@@ -349,7 +349,7 @@ class CoreParserFunctions {
 		if( $file ) {
 			$url = $file->getFullUrl();
 			if( $option == 'nowiki' ) {
-				return "<nowiki>$url</nowiki>";
+				return array( $url, 'nowiki' => true );
 			}
 			return $url;
 		} else {