* (bug 3475) anon contrib links on Special:Newpages

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 6541a09..d297597 100644 (file)
--- 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 3eda0f3..ec6d4c3 100644 (file)
--- 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>';
                        }