If the Overflow menu is visible, don't render user links
User links bar has the items already rendered in toolbar/overflow menus. There is no need to render user links if the overflow menu is available. Bug: T224735 Change-Id: I613fa68b6cd43acf07bcb85af77d0239dc6bba6b
This commit is contained in:
parent
62090bcd69
commit
686e116d60
|
@ -560,6 +560,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
|
||||||
|
@ -569,7 +570,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 = [
|
||||||
|
|
Loading…
Reference in New Issue