Thijs/wiki.techinc.nl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Revert "Create buildPersonalPage method for SkinTemplate class, add menu item to personal menu..""

Browse source
This commit is contained in:
jenkins-bot 2021-05-12 06:31:50 +00:00 committed by Gerrit Code Review
commit 675694308c
1 changed files with 8 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
includes/skins/SkinTemplate.php
View file

@ -522,7 +522,14 @@ class SkinTemplate extends Skin {
}
if ( $this->loggedin ) {
$personal_urls['userpage'] = $this->buildPersonalPageItem();
$personal_urls['userpage'] = [
'text' => $this->username,
'href' => &$this->userpageUrlDetails['href'],
'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'exists' => $this->userpageUrlDetails['exists'],
'active' => ( $this->userpageUrlDetails['href'] == $pageurl ),
'dir' => 'auto'
];
// Merge notifications into the personal menu for older skins.
if ( $includeNotifications ) {
@ -666,22 +673,6 @@ class SkinTemplate extends Skin {
return $personal_urls;
}
/**
* Build a personal page link.
* @return array
*/
protected function buildPersonalPageItem(): array {
// Build the personal page link array.
return [
'text' => $this->username,
'href' => &$this->userpageUrlDetails['href'],
'class' => $this->userpageUrlDetails['exists'] ? false : 'new',
'exists' => $this->userpageUrlDetails['exists'],
'active' => ( $this->userpageUrlDetails['href'] == $this->getTitle()->getLocalURL() ),
'dir' => 'auto'
];
}
/**
* Builds an array with tab definition
*
@ -874,7 +865,6 @@ class SkinTemplate extends Skin {
$permissionManager = MediaWikiServices::getInstance()->getPermissionManager();
$content_navigation = [
'user-page' => $this->loggedin ? [ 'userpage' => $this->buildPersonalPageItem() ] : [],
'user-menu' => $this->buildPersonalUrls( false ),
'notifications' => [],
'namespaces' => [],