wikimedia/mediawiki-extensions-MultimediaViewer
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/MultimediaViewer synced 2024-11-12 09:27:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Load MMV scripts for everyone; handle hashes"

Browse source
This commit is contained in:
jenkins-bot 2014-03-26 11:04:07 +00:00 committed by Gerrit Code Review
parent 25ca9a4eb8 3a87587fe3
commit fead16cf99
1 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
MultimediaViewerHooks.php
View file

@ -33,7 +33,7 @@ class MultimediaViewerHooks {
* @param User $user
* @return bool
*/
protected static function shouldLoad( $user ) {
protected static function shouldHandleClicks( $user ) {
global $wgMediaViewerIsInBeta, $wgEnableMediaViewerForLoggedInUsersOnly;
if ( $wgMediaViewerIsInBeta && class_exists( 'BetaFeatures' ) ) {
@ -53,10 +53,6 @@ class MultimediaViewerHooks {
* @return bool
*/
protected static function getModules( &$out ) {
if ( !self::shouldLoad( $out->getUser() ) ) {
return true;
}
$out->addModules( array( 'mmv.bootstrap.autostart' ) );
return true;
@ -125,7 +121,7 @@ class MultimediaViewerHooks {
'globalUsageAvailable' => isset( $wgAPIPropModules['globalusage'] ),
);
$vars['wgNetworkPerformanceSamplingFactor'] = $wgNetworkPerformanceSamplingFactor;
$vars['wgMediaViewerOnClick'] = self::shouldLoad( User::newFromSession() );
$vars['wgMediaViewerOnClick'] = self::shouldHandleClicks( User::newFromSession() );
$vars['wgMediaViewer'] = true;
return true;