mirror of
https://gerrit.wikimedia.org/r/mediawiki/skins/Vector.git
synced 2024-11-12 01:09:20 +00:00
Merge "Fixes missing account login in OfficeWiki"
This commit is contained in:
commit
ba00ff199f
|
@ -289,13 +289,17 @@ class Hooks implements
|
|||
if ( !$isRegistered ) {
|
||||
// Remove "Not logged in" from personal menu dropdown for anon users.
|
||||
unset( $content_navigation['user-menu']['anonuserpage'] );
|
||||
// Remove duplicate "Login" link added by SkinTemplate::buildPersonalUrls if group read permissions
|
||||
// are set to false.
|
||||
unset( $content_navigation['user-menu']['login-private'] );
|
||||
|
||||
// Make login and create account collapsible
|
||||
$content_navigation['user-menu']['login']['collapsible'] = true;
|
||||
$content_navigation['user-menu']['createaccount']['collapsible'] = true;
|
||||
if ( isset( $content_navigation['user-menu']['login'] ) ) {
|
||||
$content_navigation['user-menu']['login']['collapsible'] = true;
|
||||
}
|
||||
if ( isset( $content_navigation['user-menu']['login-private'] ) ) {
|
||||
$content_navigation['user-menu']['login-private']['collapsible'] = true;
|
||||
}
|
||||
if ( isset( $content_navigation['user-menu']['createaccount'] ) ) {
|
||||
$content_navigation['user-menu']['createaccount']['collapsible'] = true;
|
||||
}
|
||||
|
||||
// Anon editor links handled manually in new anon editor menu
|
||||
$anonEditorMenu = [];
|
||||
|
@ -398,6 +402,15 @@ class Hooks implements
|
|||
'icon' => '',
|
||||
] );
|
||||
}
|
||||
if ( isset( $content_navigation['user-menu']['login-private'] ) ) {
|
||||
$content_navigation[$overflow]['login-private'] = array_merge(
|
||||
$content_navigation['user-menu']['login-private'], [
|
||||
'id' => 'pt-login-private-2',
|
||||
'collapsible' => true,
|
||||
// Remove icon
|
||||
'icon' => '',
|
||||
] );
|
||||
}
|
||||
|
||||
self::updateMenuItems( $content_navigation, $overflow );
|
||||
}
|
||||
|
|
|
@ -507,7 +507,6 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
|
|||
'anonuserpage' => [ 'class' => [], 'icon' => 'anonuserpage' ],
|
||||
'createaccount' => [ 'class' => [], 'icon' => 'createaccount' ],
|
||||
'login' => [ 'class' => [], 'icon' => 'login' ],
|
||||
'login-private' => [ 'class' => [], 'icon' => 'login-private' ],
|
||||
'anontalk' => [ 'class' => [], 'icon' => 'anontalk' ],
|
||||
'anoncontribs' => [ 'class' => [], 'icon' => 'anoncontribs' ],
|
||||
],
|
||||
|
@ -517,7 +516,7 @@ class VectorHooksTest extends MediaWikiIntegrationTestCase {
|
|||
count( $contentAnon['user-menu'] ) === 2 &&
|
||||
isset( $contentAnon['user-menu']['createaccount'] ) &&
|
||||
isset( $contentAnon['user-menu']['login'] ),
|
||||
'Anon user page, login private and anon talk, anon contribs links are removed from user-menu'
|
||||
'Anon user page, anon talk, anon contribs links are removed from user-menu'
|
||||
);
|
||||
|
||||
$this->assertTrue(
|
||||
|
|
Loading…
Reference in a new issue