wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-27 23:50:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Check title value before proceeding to check if user page

Browse source 
Bug: T245162
Change-Id: I7b826fb0e07a58947f381893604f308903c30304
This commit is contained in:
jdlrobson 2020-02-17 10:30:54 -08:00 committed by Jdlrobson
parent 5f198fe0d8
commit d48ce1e729
1 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
includes/MinervaHooks.php
View file

@ -205,22 +205,33 @@ class MinervaHooks {
MobileContext $mobileContext, Skin $skin
) {
// setSkinOptions is not available
if ( $skin instanceof SkinMinerva ) {
if ( $skin instanceof SkinMinerva
) {
$services = MediaWikiServices::getInstance();
$featureManager = $services
->getService( 'MobileFrontend.FeaturesManager' );
$skinOptions = $services->getService( 'Minerva.SkinOptions' );
$title = $skin->getTitle();
// T232653: TALK_AT_TOP, HISTORY_IN_PAGE_ACTIONS, TOOLBAR_SUBMENU should
// be true on user pages and user talk pages for all users
//
// For some reason using $services->getService( 'SkinUserPageHelper' )
// here results in a circular dependency error which is why
// SkinUserPageHelper is being instantiated instead.
$relevantUserPageHelper = new SkinUserPageHelper(
$title->inNamespace( NS_USER_TALK ) ? $title->getSubjectPage() : $title
);
$isUserPageOrUserTalkPage = $relevantUserPageHelper->isUserPage();
// T245162 - this should only apply if the context relates to a page view.
// Examples:
// - parsing wikitext during an REST response
// - a ResourceLoader response
if ( $title !== null ) {
// T232653: TALK_AT_TOP, HISTORY_IN_PAGE_ACTIONS, TOOLBAR_SUBMENU should
// be true on user pages and user talk pages for all users
//
// For some reason using $services->getService( 'SkinUserPageHelper' )
// here results in a circular dependency error which is why
// SkinUserPageHelper is being instantiated instead.
$relevantUserPageHelper = new SkinUserPageHelper(
$title->inNamespace( NS_USER_TALK ) ? $title->getSubjectPage() : $title
);
$isUserPageOrUserTalkPage = $relevantUserPageHelper->isUserPage();
} else {
// If no title this must be false
$isUserPageOrUserTalkPage = false;
}
$isBeta = $mobileContext->isBetaGroupMember();
$skinOptions->setMultiple( [