From 71d7da43e0b2cd63ec7fef5d038c2040e08683b2 Mon Sep 17 00:00:00 2001
From: Brion Vibber <brion@users.mediawiki.org>
Date: Sat, 17 Sep 2005 00:17:34 +0000
Subject: [PATCH] * (bug 3475) anon contrib links on Special:Newpages

---
 RELEASE-NOTES              | 1 +
 includes/SpecialUpload.php | 7 ++++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6541a093ed..d297597463 100644
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -110,6 +110,7 @@ fully support the editing toolbar, but was found to be too confusing.
 * Clean up duplicate code for selection of changeslist style
 * (bug 3475) anon contrib links on Special:Newpages
 * Correct blob caching to reduce redundant blob loads on backups
+* (bug 3485) Fix bogus warning about filename capitalization when off
 
 
 === Caveats ===
diff --git a/includes/SpecialUpload.php b/includes/SpecialUpload.php
index 3eda0f3afa..ec6d4c3708 100644
--- a/includes/SpecialUpload.php
+++ b/includes/SpecialUpload.php
@@ -247,7 +247,12 @@ class UploadForm {
 		 */
 		if ( ! $this->mIgnoreWarning ) {
 			$warning = '';
-			if( $this->mUploadSaveName != ucfirst( $filtered ) ) {
+			
+			global $wgCapitalLinks;
+			if( $wgCapitalLinks ) {
+				$filtered = ucfirst( $filtered );
+			}
+			if( $this->mUploadSaveName != $filtered ) {
 				$warning .=  '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mUploadSaveName ) ).'</li>';
 			}
 
-- 
2.20.1