wikimedia/mediawiki-extensions-Math
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Math synced 2024-11-24 15:44:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove fallback to $wgUser in MathHooks::onPageRenderingHash

Browse source 
$user is always set

Bug: T248550
Change-Id: Id5a0d271ae840dd2aee4f40b4b7e73ab24f7cf98
This commit is contained in:
DannyS712 2020-09-21 21:20:53 +00:00
parent bf070bf32b
commit caa51dc4c9
1 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/MathHooks.php
View file

@ -104,20 +104,16 @@ class MathHooks {
* Generate a user dependent hash cache key. * Generate a user dependent hash cache key.
* The hash key depends on the rendering mode. * The hash key depends on the rendering mode.
* @param string &$confstr The to-be-hashed key string that is being constructed * @param string &$confstr The to-be-hashed key string that is being constructed
* @param User|bool $user reference to the current user * @param User $user reference to the current user
* @param array &$forOptions userOptions used on that page * @param array &$forOptions userOptions used on that page
* @return true * @return true
*/ */
public static function onPageRenderingHash( &$confstr, $user = false, &$forOptions = [] ) { public static function onPageRenderingHash( &$confstr, $user, &$forOptions = [] ) {
global $wgUser;
// To be independent of the MediaWiki core version, // To be independent of the MediaWiki core version,
// we check if the core caching logic for math is still available. // we check if the core caching logic for math is still available.
// TODO this check shouldn't be needed anymore, since none of the versions of MediaWiki
// core that this extension supports have the method.
if ( !is_callable( 'ParserOptions::getMath' ) && in_array( 'math', $forOptions ) ) { if ( !is_callable( 'ParserOptions::getMath' ) && in_array( 'math', $forOptions ) ) {
if ( $user === false ) {
$user = $wgUser;
}
$mathString = self::mathModeToString( $user->getOption( 'math' ) ); $mathString = self::mathModeToString( $user->getOption( 'math' ) );
$mathOption = self::mathModeToHashKey( $mathString, 0 ); $mathOption = self::mathModeToHashKey( $mathString, 0 );
// Check if the key already contains the math option part // Check if the key already contains the math option part