jenkins-bot has submitted this change and it was merged.
Change subject: Check MwEmbed dependency only before it is needed
......................................................................
Check MwEmbed dependency only before it is needed
Fix dependency check to not depend on loadorder, depend on 'late
setup' instead. We should probably migrate this setup function to a
$wgExtensionFunctions, instead of abusing SetupAfterCache hook. That
is T90282
Bug: T88729
Change-Id: I77b18639f6ff04666619f8f59974d0333591fde6
---
M TimedMediaHandler.hooks.php
M TimedMediaHandler.php
2 files changed, 5 insertions(+), 5 deletions(-)
Approvals:
Aaron Schulz: Looks good to me, approved
jenkins-bot: Verified
diff --git a/TimedMediaHandler.hooks.php b/TimedMediaHandler.hooks.php
index fadb396..4d3c091 100644
--- a/TimedMediaHandler.hooks.php
+++ b/TimedMediaHandler.hooks.php
@@ -24,6 +24,11 @@
}
}
+ if( !class_exists( 'MwEmbedResourceManager' ) ) {
+ echo "TimedMediaHandler requires the MwEmbedSupport
extension.\n";
+ exit( 1 );
+ }
+
// Register the Timed Media Handler javascript resources (
MwEmbed modules )
MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/EmbedPlayer' );
MwEmbedResourceManager::register(
'extensions/TimedMediaHandler/MwEmbedModules/TimedText' );
diff --git a/TimedMediaHandler.php b/TimedMediaHandler.php
index b1e0025..ac3cf28 100644
--- a/TimedMediaHandler.php
+++ b/TimedMediaHandler.php
@@ -5,11 +5,6 @@
exit( 1 );
}
-if( !class_exists( 'MwEmbedResourceManager' ) ) {
- echo "TimedMediaHandler requires the MwEmbedSupport extension.\n";
- exit( 1 );
-}
-
// Set up the timed media handler dir:
$timedMediaDir = __DIR__;
// Include WebVideoTranscode (prior to config so that its defined transcode
keys can be used in configuration)
--
To view, visit https://gerrit.wikimedia.org/r/191997
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I77b18639f6ff04666619f8f59974d0333591fde6
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/TimedMediaHandler
Gerrit-Branch: master
Gerrit-Owner: TheDJ <hartman.w...@gmail.com>
Gerrit-Reviewer: Aaron Schulz <asch...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
