* (bug 13835) Fix rendering of {{filepath:Wiki.png|nowiki}}

Patch by Olaf Lenz

diff --git a/CREDITS b/CREDITS
index f1adc6f..9a51f84 100644 (file)
--- 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 5b7fff3..cc262f2 100644 (file)
--- 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 8fec0ab..05b4fe9 100644 (file)
--- 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 {