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

Use User::getDefaultOptions instead of wgDefaultUserOptions

Browse source 
multimediaviewer-enable default option does not exist in
$wgDefaultUserOptions, but is added in a UserGetDefaultOptions
hook callback.

User::getDefaultOptions will trigger that hook (and merge it
with $wgDefaultUserOptions), so that's the result that should
be used to figure out the value for multimediaviewer-enable.

Bug: T166058
Change-Id: Ib16a779430886305582dfce7db6600edd87ace11
This commit is contained in:
Matthias Mullie 2017-10-17 14:17:14 +02:00
parent b360693984
commit 51baec14a3
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
MultimediaViewerHooks.php
View file

@ -346,13 +346,13 @@ class MultimediaViewerHooks {
* @param OutputPage $out
*/
public static function makeGlobalVariablesScript( &$vars, OutputPage $out ) {
global $wgDefaultUserOptions;
$defaultUserOptions = User::getDefaultOptions();
$user = $out->getUser();
$vars['wgMediaViewerOnClick'] = self::shouldHandleClicks( $user );
// needed because of bug 69942; could be different for anon and logged-in
$vars['wgMediaViewerEnabledByDefault'] =
!empty( $wgDefaultUserOptions['multimediaviewer-enable'] );
!empty( $defaultUserOptions['multimediaviewer-enable'] );
}
/**