From: Brion Vibber <brion@users.mediawiki.org>
Date: Sun, 21 Aug 2005 23:15:26 +0000 (+0000)
Subject: * (bug 3216) Don't show empty warning page when no warnings.
X-Git-Tag: 1.6.0~1842
X-Git-Url: http://git.cyclocoop.org/geomaker.php?a=commitdiff_plain;h=d3a358a2271d572c3bb38804b5e8e2c09f74bc7c;p=lhc%2Fweb%2Fwiklou.git

* (bug 3216) Don't show empty warning page when no warnings.
---

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index d3d1ab0b3e..05aa2fd4ee 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -41,6 +41,8 @@ Misc work going on.....
 * Edit conflict on recreation of deleted page
 * (bug 3210) Fix Media: links with remote image URL path
 * (bug 1956) Hide bot uploads from Special:Newimages
+* (bug 3216) Don't show empty warning page when no warnings.
+
 
 === Caveats ===
 
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index e8f371ede6..40ab946db4 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -220,7 +220,7 @@ class UploadForm {
 		 * Check for non-fatal conditions
 		 */
 		if ( ! $this->mIgnoreWarning ) {
-			$warning = '<ul>';
+			$warning = '';
 			if( $this->mUploadSaveName != ucfirst( $filtered ) ) {
 				$warning .=  '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
 			}
@@ -254,7 +254,7 @@ class UploadForm {
 				 * Stash the file in a temporary location; the user can choose
 				 * to let it through and we'll complete the upload then.
 				 */
-				return $this->uploadWarning($warning . "</ul>");
+				return $this->uploadWarning( $warning );
 			}
 		}