From: Andrew Garrett <werdna@users.mediawiki.org>
Date: Mon, 25 Feb 2008 12:48:09 +0000 (+0000)
Subject: * (bug 13149) Correctly format fileexists message on Upload page.
X-Git-Tag: 1.31.0-rc.0~49367
X-Git-Url: https://git.cyclocoop.org/%7B%24www_url%7Dadmin/compta/exercices/journal.php?a=commitdiff_plain;h=2bb05896def5a77572c97c3c46740d8cf161ea63;p=lhc%2Fweb%2Fwiklou.git

* (bug 13149) Correctly format fileexists message on Upload page.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 3d1ffe8d8a..95efe80d60 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -30,6 +30,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
   article. This is so that readers who don't know what a red link is aren't 
   confused when they are told they are range-blocked.
 * One can turn off syndicatino feeds by setting $wgFeed to false
+* (bug 13137) Bots now able to edit protected pages.
 
 === Bug fixes in 1.13 ===
 
@@ -37,8 +38,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 13084) Increase size of source/destination filename fields in upload form
 * (bug 13115) rebuildrecentchanges should print the current value of $wgRCMaxAge
 * (bug 13132) Unable to unprotect pages protected with earlier versions of MediaWiki
-* (bug 13137) Bots to edit protected pages
 * (bug 13140) Show parent categories in category namespace
+* (bug 13149) Correctly format 'fileexists' message on Upload page.
 
 === API changes in 1.13 ===
 
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 1227b93106..c2ad0bc545 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -612,7 +612,7 @@ class UploadForm {
 				$dlink2 = '';
 			}
 
-			$warning .= '<li>' . wfMsgExt( 'fileexists', 'parseinline', $dlink ) . '</li>' . $dlink2;
+			$warning .= '<li>' . wfMsgExt( 'fileexists', array('parseinline','replaceafter'), $dlink ) . '</li>' . $dlink2;
 
 		} elseif( $file->getTitle()->getArticleID() ) {
 			$lnk = $sk->makeKnownLinkObj( $file->getTitle(), '', 'redirect=no' );