Followup to r45676, r45688, r45689, but this time actually working. :)

For bug 16968 -- don't throw a filename change warning when we auto-capitalize the file per $wgCapitalLinks.

diff --git a/includes/specials/SpecialUpload.php b/includes/specials/SpecialUpload.php
index e5a3cf9..adfea71 100644 (file)
--- a/includes/specials/SpecialUpload.php
+++ b/includes/specials/SpecialUpload.php
@@ -504,10 +504,13 @@ class UploadForm {
                if ( ! $this->mIgnoreWarning ) {
                        $warning = '';
 
-                       global $wgCapitalLinks;
-                       if ( $wgCapitalLinks ) ucfirst( $basename );
+                       $comparableName = str_replace( ' ', '_', $basename );
+                       global $wgCapitalLinks, $wgContLang;
+                       if ( $wgCapitalLinks ) {
+                               $comparableName = $wgContLang->ucfirst( $comparableName );
+                       }
 
-                       if( str_replace( ' ', '_', $basename ) != $filtered ) {
+                       if( $comparableName !== $filtered ) {
                                $warning .=  '<li>'.wfMsgHtml( 'badfilename', htmlspecialchars( $this->mDestName ) ).'</li>';
                        }