jenkins-bot has submitted this change and it was merged.
Change subject: Fix EL dependency loading
......................................................................
Fix EL dependency loading
Do it in an extension function. Cool feature.
Change-Id: I4a11d13d8c0742106ce4dda15b6b3caaa6489421
---
M MultimediaViewer.php
1 file changed, 14 insertions(+), 9 deletions(-)
Approvals:
Legoktm: Looks good to me, but someone else must approve
Gergő Tisza: Looks good to me, approved
jenkins-bot: Verified
diff --git a/MultimediaViewer.php b/MultimediaViewer.php
index ab0996b..eb5d849 100644
--- a/MultimediaViewer.php
+++ b/MultimediaViewer.php
@@ -79,16 +79,21 @@
),
), $moduleInfo );
-if ( isset( $wgResourceModules['ext.eventLogging'] ) ) {
- $wgResourceModules['schema.MediaViewer'] = array(
- 'class' => 'ResourceLoaderSchemaModule',
- 'schema' => 'MediaViewer',
- 'revision' => 6055641,
- );
+$wgExtensionFunctions[] = function () {
+ global $wgResourceModules;
- $wgResourceModules['ext.multimediaViewer']['dependencies'][] =
'ext.eventLogging';
- $wgResourceModules['ext.multimediaViewer']['dependencies'][] =
'schema.MediaViewer';
-}
+ if ( isset( $wgResourceModules['ext.eventLogging'] ) ) {
+ $wgResourceModules['schema.MediaViewer'] = array(
+ 'class' => 'ResourceLoaderSchemaModule',
+ 'schema' => 'MediaViewer',
+ 'revision' => 6055641,
+ );
+
+ $wgResourceModules['ext.multimediaViewer']['dependencies'][] =
'ext.eventLogging';
+ $wgResourceModules['ext.multimediaViewer']['dependencies'][] =
'schema.MediaViewer';
+ }
+};
+
$wgAutoloadClasses['MultimediaViewerHooks'] = __DIR__ .
'/MultimediaViewerHooks.php';
$wgHooks['GetBetaFeaturePreferences'][] =
'MultimediaViewerHooks::getBetaPreferences';
--
To view, visit https://gerrit.wikimedia.org/r/92034
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I4a11d13d8c0742106ce4dda15b6b3caaa6489421
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: MarkTraceur <[email protected]>
Gerrit-Reviewer: Gergő Tisza <[email protected]>
Gerrit-Reviewer: Legoktm <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
