wikimedia/mediawiki-skins-Vector
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git synced 2024-11-28 09:30:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Vector should not call BaseTemplate::getToolbox"

Browse source
This commit is contained in:
jenkins-bot 2020-06-11 21:27:50 +00:00 committed by Gerrit Code Review
parent a50bb109ae f4b548250d
commit 58aa874951
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/VectorTemplate.php
View file

@ -263,13 +263,7 @@ class VectorTemplate extends BaseTemplate {
$skin = $this->getSkin();
$portals = $skin->buildSidebar();
$props = [];
// Force the rendering of the following portals
if ( !isset( $portals['TOOLBOX'] ) ) {
$portals['TOOLBOX'] = true;
}
if ( !isset( $portals['LANGUAGES'] ) ) {
$portals['LANGUAGES'] = true;
}
// Render portals
foreach ( $portals as $name => $content ) {
if ( $content === false ) {
@ -283,8 +277,9 @@ class VectorTemplate extends BaseTemplate {
case 'SEARCH':
break;
case 'TOOLBOX':
$toolbox = $portals['TOOLBOX'];
$portal = $this->getMenuData(
'tb', $this->getToolbox(), self::MENU_TYPE_PORTAL
'tb', $toolbox, self::MENU_TYPE_PORTAL
);
// Run deprecated hooks.
$vectorTemplate = $this;
@ -300,7 +295,7 @@ class VectorTemplate extends BaseTemplate {
];
break;
case 'LANGUAGES':
$languages = $skin->getLanguages();
$languages = $portals['LANGUAGES'];
$portal = $this->getMenuData(
'lang',
$languages,