http://www.mediawiki.org/wiki/Special:Code/MediaWiki/95044
Revision: 95044
Author: neilk
Date: 2011-08-19 21:44:14 +0000 (Fri, 19 Aug 2011)
Log Message:
-----------
if TitleBlacklistAPI is not available, then every title has the status "not
blacklisted"
Modified Paths:
--------------
trunk/extensions/UploadWizard/UploadWizard.config.php
trunk/extensions/UploadWizard/resources/mw.DestinationChecker.js
Modified: trunk/extensions/UploadWizard/UploadWizard.config.php
===================================================================
--- trunk/extensions/UploadWizard/UploadWizard.config.php 2011-08-19
21:00:43 UTC (rev 95043)
+++ trunk/extensions/UploadWizard/UploadWizard.config.php 2011-08-19
21:44:14 UTC (rev 95044)
@@ -377,6 +377,9 @@
// URL for alternative uploading form
'altUploadForm' => '',
+ // Is titleBlacklist API even available?
+ 'useTitleBlacklistApi' => array_key_exists( 'titleblacklist',
$wgAPIModules ),
+
// Wiki page for reporting issues with the blacklist
'blacklistIssuesPage' => '',
Modified: trunk/extensions/UploadWizard/resources/mw.DestinationChecker.js
===================================================================
--- trunk/extensions/UploadWizard/resources/mw.DestinationChecker.js
2011-08-19 21:00:43 UTC (rev 95043)
+++ trunk/extensions/UploadWizard/resources/mw.DestinationChecker.js
2011-08-19 21:44:14 UTC (rev 95044)
@@ -150,8 +150,12 @@
callback( { 'blacklist': _this.cachedBlacklist[title] }
);
return;
}
-
- _this.api.isBlacklisted( title, function( blacklistResult ) {
+
+ /**
+ * Processes result of a TitleBlacklist api call with callback()
+ * @param mixed - false if not blacklisted, object if
blacklisted
+ */
+ var blacklistResultProcessor = function( blacklistResult ) {
var result;
if( blacklistResult === false ) {
@@ -167,7 +171,14 @@
_this.cachedBlacklist[title] = result;
callback( { 'blacklist': result } );
- } );
+ };
+
+ if ( UploadWizardConfig.useTitleBlacklistApi ) {
+ _this.api.isBlacklisted( title,
blacklistResultProcessor );
+ } else {
+ // it's not blacklisted, because the API isn't even
available
+ blacklistResultProcessor( false );
+ }
},
/**
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
