http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95815
Revision: 95815
Author: raindrift
Date: 2011-08-30 21:06:06 +0000 (Tue, 30 Aug 2011)
Log Message:
-----------
Disable internal regex checks when TitleBlacklist checking is enabled.
Fixes bug 30624
Modified Paths:
--------------
trunk/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
Modified:
trunk/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
===================================================================
---
trunk/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
2011-08-30 20:55:50 UTC (rev 95814)
+++
trunk/extensions/UploadWizard/resources/jquery/jquery.validate.wmCommonsBlacklist.js
2011-08-30 21:06:06 UTC (rev 95815)
@@ -1,7 +1,10 @@
/**
- * Does some local checking of a file. For more specific filenames (such as
bad words, other blacklisted stuff) use
- * the Blacklist API.
+ * Does some local checking of a filename.
+ * If you want more specific filename checks (such as bad words, other
blacklisted stuff) use the TitleBlacklist API.
*
+ * These checks are ignored when the TitleBlacklist API is available, since
presumably they should be configured there instead, where it's
+ * possible to update them easily and higher-quality error messages are
available.
+ *
* This is an incomplete rendering of some of the meta.wikimedia.org and
commons.wikimedia.org blacklist as they existed on 2011-05-05, and
* ignores cases that are irrelevant to uploading new media images.
* - all regexes are case INsensitive by default
Modified: trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2011-08-30 20:55:50 UTC (rev 95814)
+++ trunk/extensions/UploadWizard/resources/mw.UploadWizardDetails.js
2011-08-30 21:06:06 UTC (rev 95815)
@@ -269,23 +269,33 @@
_this.addDescription( true, mw.config.get( 'wgUserLanguage' ) );
$j( containerDiv ).append( _this.div );
- // make the title field required, and non-blacklisted
- _this.$form.find( '.mwe-title' )
- .rules( "add", {
- required: true,
- titleBadchars: true,
- titleSenselessimagename: true,
- titleThumbnail: true,
- titleExtension: true,
- messages: {
- required: gM( 'mwe-upwiz-error-blank' ),
- titleBadchars: gM(
'mwe-upwiz-error-title-badchars' ),
- titleSenselessimagename: gM(
'mwe-upwiz-error-title-senselessimagename' ),
- titleThumbnail: gM(
'mwe-upwiz-error-title-thumbnail' ),
- titleExtension: gM(
'mwe-upwiz-error-title-extension' )
- }
- } );
-
+ if( UploadWizardConfig.useTitleBlacklistApi ) {
+ // less strict checking, since TitleBlacklist checks should
catch most errors.
+ _this.$form.find( '.mwe-title' )
+ .rules( "add", {
+ required: true,
+ messages: {
+ required: gM( 'mwe-upwiz-error-blank' ),
+ }
+ } );
+ } else {
+ // make the title field required, and non-blacklisted
+ _this.$form.find( '.mwe-title' )
+ .rules( "add", {
+ required: true,
+ titleBadchars: true,
+ titleSenselessimagename: true,
+ titleThumbnail: true,
+ titleExtension: true,
+ messages: {
+ required: gM( 'mwe-upwiz-error-blank' ),
+ titleBadchars: gM(
'mwe-upwiz-error-title-badchars' ),
+ titleSenselessimagename: gM(
'mwe-upwiz-error-title-senselessimagename' ),
+ titleThumbnail: gM(
'mwe-upwiz-error-title-thumbnail' ),
+ titleExtension: gM(
'mwe-upwiz-error-title-extension' )
+ }
+ } );
+ }
// make this a category picker
var hiddenCats = mw.isDefined( mw.UploadWizard.config.autoCategories )
? mw.UploadWizard.config.autoCategories : [];
if ( mw.isDefined( mw.UploadWizard.config.autoCategory ) &&
mw.UploadWizard.config.autoCategory !== '' ) {
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
