(bug 14551) - Cancel upload no longer automatically suppresses warnings.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index de00596..e0c467b 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -371,6 +371,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 14511) MediaWiki:Delete-legend is no longer double escaped
 * Generate correct section anchors for numeric headers
 * (bug 14520) Don't load nonexistent CSS files for Chick/Myskin/Simple skins
+* (bug 14551) Cancel upload no longer automatically suppresses warnings
 
 === API changes in 1.13 ===
 

diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index a77516c..8365c72 100644 (file)
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -909,7 +909,7 @@ class UploadForm {
                $wgOut->addHTML(
                        Xml::openElement( 'form', array( 'method' => 'post', 'action' => $titleObj->getLocalURL( 'action=submit' ),
                                 'enctype' => 'multipart/form-data', 'id' => 'uploadwarning' ) ) . "\n" .
-                       Xml::hidden( 'wpIgnoreWarning', '1' ) . "\n" .
+                       Xml::hidden( 'wpIgnoreWarning', $this->mIgnoreWarning ) . "\n" .
                        Xml::hidden( 'wpSessionKey', $this->mSessionKey ) . "\n" .
                        Xml::hidden( 'wpUploadDescription', $this->mComment ) . "\n" .
                        Xml::hidden( 'wpLicense', $this->mLicense ) . "\n" .