http://www.mediawiki.org/wiki/Special:Code/MediaWiki/88293

Revision: 88293
Author:   catrope
Date:     2011-05-17 11:33:01 +0000 (Tue, 17 May 2011)
Log Message:
-----------
1.17wmf1: MFT r87867

Modified Paths:
--------------
    
branches/wmf/1.17wmf1/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js

Modified: 
branches/wmf/1.17wmf1/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
===================================================================
--- 
branches/wmf/1.17wmf1/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
        2011-05-17 10:30:40 UTC (rev 88292)
+++ 
branches/wmf/1.17wmf1/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
        2011-05-17 11:33:01 UTC (rev 88293)
@@ -71,7 +71,7 @@
                        /^JD[\d\s]+$/, //  Jenoptik
                        /^SDC[\d\s]+$/, //  Samsung
                        /^DVC[\d\s]+$/, //  DoCoMo
-                       /^SANY[\d\s]+$/, //  Sanyo
+                       /^SANY[\d\s]+$/ //  Sanyo
                ],
 
                // filename from elsewhere
@@ -88,7 +88,7 @@
                        /^[^A-Za-z]*(small|medium|large)\)?/,
                        
/^(Untitled|No[-_]?name|Picture|Pict?|Image[mn]?|Img|Immagine|Photo|Foto|Bild|Scan|Panorama|Sin_título)[^A-Za-z]*/,
                        
/^(January|Jan|February|Febr?|March|Mar|April|Apr|May|June?|July?|August|Aug|September|Sept?|October|Oct|November|Nov|December|Dec)[^A-Za-z]*/,
-                       /^[0-9 ]*([A-Z][0-9 ]*){30,}/,
+                       /^[0-9 ]*([A-Z][0-9 ]*){30,}/
                ],
 
                'titleThumbnail': [
@@ -106,7 +106,8 @@
                        return function( value, element, params ) {
                                var ok = true;
                                $.each( regexes, function( i, regex ) {
-                                       if ( value.match( regex ) ) {
+                                       // if we make a mistake with commas in 
the above list, IE sometimes gives us an undefined regex, causes nastiness
+                                       if ( typeof regex !== undefined && 
value.match( regex ) ) {
                                                ok = false;
                                                return false;
                                        }


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to