From: Derk-Jan Hartman <hartman@videolan.org>
Date: Sat, 25 Aug 2012 23:25:12 +0000 (+0200)
Subject: (bug 26995) Update filename field on Special:Upload after sanitizing
X-Git-Tag: 1.31.0-rc.0~21752^2
X-Git-Url: http://git.cyclocoop.org/%22.%20generer_url_ecrire%28%22sites_tous%22%2C%22%22%29.%20%22?a=commitdiff_plain;h=29da88b7f5f5839aa4d8f643cc4952deba25ea41;p=lhc%2Fweb%2Fwiklou.git

(bug 26995) Update filename field on Special:Upload after sanitizing

Patchset 4: Whitespace fix and comment fixes
Patchset 6: Whitespace fix and rebase
Patchset 7: Alignment of comment

Change-Id: I85656a3647766f8a35a7baae1c656d8dc315fc91
---

diff --git a/RELEASE-NOTES-1.21 b/RELEASE-NOTES-1.21
index 7111254fb8..ce6966eda2 100644
--- a/RELEASE-NOTES-1.21
+++ b/RELEASE-NOTES-1.21
@@ -57,6 +57,7 @@ production.
 * (bug 41494) Honor $wgLogExceptionBacktrace when logging non-API exceptions
   caught during API execution.
 * (bug 37963) Fixed loading process for user options
+* (bug 26995) Update filename field on Upload page after having sanitized it.
 
 === API changes in 1.21 ===
 * prop=revisions can now report the contentmodel and contentformat, see docs/contenthandler.txt
diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index fd24af1a4e..73c7e2aefd 100644
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -312,12 +312,12 @@ class SpecialUpload extends SpecialPage {
 		$this->showUploadForm( $form );
 	}
 	/**
-	 * Stashes the upload, shows the main form, but adds an "continue anyway button".
+	 * Stashes the upload, shows the main form, but adds a "continue anyway button".
 	 * Also checks whether there are actually warnings to display.
 	 *
 	 * @param $warnings Array
 	 * @return boolean true if warnings were displayed, false if there are no
-	 * 	warnings and the should continue processing like there was no warning
+	 *         warnings and it should continue processing
 	 */
 	protected function showUploadWarning( $warnings ) {
 		# If there are no warnings, or warnings we can ignore, return early.
@@ -336,6 +336,9 @@ class SpecialUpload extends SpecialPage {
 		$warningHtml = '<h2>' . $this->msg( 'uploadwarning' )->escaped() . "</h2>\n"
 			. '<ul class="warning">';
 		foreach( $warnings as $warning => $args ) {
+			if( $warning == 'badfilename' ) {
+				$this->mDesiredDestName = Title::makeTitle( NS_FILE, $args )->getText();
+			}
 			if( $warning == 'exists' ) {
 				$msg = "\t<li>" . self::getExistsWarning( $args ) . "</li>\n";
 			} elseif( $warning == 'duplicate' ) {