From: Chad Horohoe <demon@users.mediawiki.org>
Date: Mon, 16 Jun 2008 01:45:32 +0000 (+0000)
Subject: (bug 14551) - Cancel upload no longer automatically suppresses warnings.
X-Git-Tag: 1.31.0-rc.0~47004
X-Git-Url: http://git.cyclocoop.org/data/%24oldEdit?a=commitdiff_plain;h=e9255cdffac191281bc0cd981a1eb4103bc7838f;p=lhc%2Fweb%2Fwiklou.git

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

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index de005969ed..e0c467b92b 100644
--- 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 a77516c718..8365c72846 100644
--- 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" .