Legoktm has uploaded a new change for review.
https://gerrit.wikimedia.org/r/92030
Change subject: Remove dependency upon BetaFeatures extension
......................................................................
Remove dependency upon BetaFeatures extension
Change-Id: I21bb7d015c74784bb41e1a0402e74ec9458662aa
---
M MultimediaViewerHooks.php
1 file changed, 13 insertions(+), 4 deletions(-)
git pull
ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/MultimediaViewer
refs/changes/30/92030/1
diff --git a/MultimediaViewerHooks.php b/MultimediaViewerHooks.php
index 0d18a71..9d8bb7b 100644
--- a/MultimediaViewerHooks.php
+++ b/MultimediaViewerHooks.php
@@ -23,11 +23,20 @@
class MultimediaViewerHooks {
- // Add JavaScript to the page when an image is on it
- // and the user has enabled the feature.
+ /*
+ * Handler for BeforePageDisplay hook
+ * Add JavaScript to the page when an image is on it
+ * and the user has enabled the feature if BetaFeatures is installed
+ * @param OutputPage $out
+ * @param Skin $skin
+ * @return bool
+ */
static function getModules( &$out, &$skin ) {
- if ( BetaFeatures::isFeatureEnabled( $out->getUser(),
'multimedia-viewer' ) &&
- count( $out->getFileSearchOptions() ) > 0 ) {
+ if ( class_exists( 'BetaFeatures')
+ && !BetaFeatures::isFeatureEnabled( $out->getUser(),
'multimedia-viewer' ) ) {
+ return true;
+ }
+ if ( count( $out->getFileSearchOptions() ) > 0 ) {
$out->addModules( array( 'ext.multimediaViewer' ) );
}
--
To view, visit https://gerrit.wikimedia.org/r/92030
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I21bb7d015c74784bb41e1a0402e74ec9458662aa
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/MultimediaViewer
Gerrit-Branch: master
Gerrit-Owner: Legoktm <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
