(bug 14496) Fix regression with parseinline on Special:Upload

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 074856e..21ba591 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -357,7 +357,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11084) $wgDBprefix replacement for updater SQL will now work for
   extension tables using uppercase letters or digits in their names.
 * (bug 12311) Fix regression with lists at start of undeletion preview
-
+* (bug 14496) Fix regression with parseinline on Special:Upload.
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index a5096b3..530368b 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -1043,8 +1043,9 @@ wgUploadAutoFill = {$autofill};
                $val2 = $wgAllowCopyUploads ? min( $wgMaxUploadSize, $val2 ) : $val2;
                $maxUploadSize = wfMsgExt( 'upload-maxfilesize', array( 'parseinline', 'escapenoentities' ), $wgLang->formatSize( $val2 ) );
 
-               $sourcefilename = wfMsgExt( 'sourcefilename', 'escapenoentities' );
-               $destfilename = wfMsgExt( 'destfilename', 'escapenoentities' );
+               $sourcefilename = wfMsgExt( 'sourcefilename', array( 'parseinline', 'escapenoentities' ) );
+        $destfilename = wfMsgExt( 'destfilename', array( 'parseinline', 'escapenoentities' ) ); 
+               
                $summary = wfMsgExt( 'fileuploadsummary', 'parseinline' );
 
                $licenses = new Licenses();