wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-12-01 09:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "If the Overflow menu is visible, don't render user links"

Browse source
This commit is contained in:
jenkins-bot 2019-07-04 20:49:03 +00:00 committed by Gerrit Code Review
parent aacaa91f46 686e116d60
commit c6b9bcb468
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
includes/skins/SkinMinerva.php
View file

@ -559,6 +559,7 @@ class SkinMinerva extends SkinTemplate {
} }
return Html::rawElement( 'h1', [ 'id' => 'section_0' ], $heading ); return Html::rawElement( 'h1', [ 'id' => 'section_0' ], $heading );
} }
/** /**
* Create and prepare header and footer content * Create and prepare header and footer content
* @param BaseTemplate $tpl * @param BaseTemplate $tpl
@ -568,7 +569,10 @@ class SkinMinerva extends SkinTemplate {
$user = $this->getUser(); $user = $this->getUser();
$out = $this->getOutput(); $out = $this->getOutput();
$tpl->set( 'taglinehtml', $this->getTaglineHtml() ); $tpl->set( 'taglinehtml', $this->getTaglineHtml() );
if ( $this->getUserPageHelper()->isUserPage() ) { if ( $this->getUserPageHelper()->isUserPage() &&
// when overflow menu is visible, we don't need to build secondary options
// as most of options are visible on Toolbar/Overflow menu
!$this->skinOptions->get( SkinOptions::OPTION_OVERFLOW_SUBMENU ) ) {
$pageUser = $this->getUserPageHelper()->getPageUser(); $pageUser = $this->getUserPageHelper()->getPageUser();
$talkPage = $pageUser->getTalkPage(); $talkPage = $pageUser->getTalkPage();
$data = [ $data = [