From 686e116d60bbe44c437bedd9a5c4f07b7f023213 Mon Sep 17 00:00:00 2001 From: Piotr Miazga Date: Fri, 21 Jun 2019 22:07:11 +0200 Subject: [PATCH] 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 --- includes/skins/SkinMinerva.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/includes/skins/SkinMinerva.php b/includes/skins/SkinMinerva.php index 36fe854..51dd090 100644 --- a/includes/skins/SkinMinerva.php +++ b/includes/skins/SkinMinerva.php @@ -560,6 +560,7 @@ class SkinMinerva extends SkinTemplate { } return Html::rawElement( 'h1', [ 'id' => 'section_0' ], $heading ); } + /** * Create and prepare header and footer content * @param BaseTemplate $tpl @@ -569,7 +570,10 @@ class SkinMinerva extends SkinTemplate { $user = $this->getUser(); $out = $this->getOutput(); $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(); $talkPage = $pageUser->getTalkPage(); $data = [