Kaldari has submitted this change and it was merged.
Change subject: Fix dependency on TitleBlacklist
......................................................................
Fix dependency on TitleBlacklist
Bug: 46165
Change-Id: Icc46f8e93c0568798ddef867fb2444d50134b80f
---
M UploadWizardHooks.php
1 file changed, 4 insertions(+), 2 deletions(-)
Approvals:
Reedy: Looks good to me, but someone else must approve
Kaldari: Verified; Looks good to me, approved
jenkins-bot: Checked
diff --git a/UploadWizardHooks.php b/UploadWizardHooks.php
index e12c89f..956228a 100644
--- a/UploadWizardHooks.php
+++ b/UploadWizardHooks.php
@@ -35,7 +35,6 @@
'mediawiki.api.edit',
'mediawiki.api.category',
'mediawiki.api.parse',
- 'mediawiki.api.titleblacklist',
'mediawiki.Title',
'mediawiki.user',
'mediawiki.feedback'
@@ -489,10 +488,13 @@
* Adds modules to ResourceLoader
*/
public static function resourceLoaderRegisterModules( &$resourceLoader
) {
- global $wgExtensionAssetsPath;
+ global $wgExtensionAssetsPath, $wgAPIModules;
$localpath = dirname( __FILE__ );
$remotepath = "$wgExtensionAssetsPath/UploadWizard";
+ if ( array_key_exists( 'titleblacklist', $wgAPIModules ) ) {
+ self::$modules['ext.uploadWizard']['dependencies'][] =
'mediawiki.api.titleblacklist';
+ }
foreach ( self::$modules as $name => $resources ) {
$resourceLoader->register( $name, new
ResourceLoaderFileModule( $resources, $localpath, $remotepath ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/54006
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc46f8e93c0568798ddef867fb2444d50134b80f
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Alex Monk <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Reedy <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
