(bug 8890) Enable wiki text for "license" message

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d124d85..79bb959 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -91,6 +91,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * Add 'Orphanedpages' as an alias to Special:Lonelypages
 * (bug 9328) Use "revision-info-current" message in place of "revision-info"
   when viewing the current revision of a page, if available
+* (bug 8890) Enable wiki text for "license" message
 
 == Bugfixes since 1.10 ==
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index a223341..36ad4a8 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -725,7 +725,7 @@ class UploadForm {
                $summary = wfMsgWikiHtml( 'fileuploadsummary' );
 
                $licenses = new Licenses();
-               $license = wfMsgHtml( 'license' );
+               $license = wfMsgExt( 'license', array( 'parseinline' ) );
                $nolicense = wfMsgHtml( 'nolicense' );
                $licenseshtml = $licenses->getHtml();