diff --git a/core/modules/contact/contact.module b/core/modules/contact/contact.module index a15f394..129fa8d 100644 --- a/core/modules/contact/contact.module +++ b/core/modules/contact/contact.module @@ -119,20 +119,20 @@ function contact_menu() { * Implements hook_default_menu_links(). */ function contact_default_menu_links() { - $items['admin.structure.contact'] = array( + $links['admin.structure.contact'] = array( 'link_title' => 'Contact form categories', 'parent' => 'admin.structure', 'description' => 'Create a system contact form and set up categories for the form to use.', 'route_name' => 'contact_category_list', ); - $items['contact'] = array( + $links['contact'] = array( 'link_title' => 'Contact', 'link_path' => 'contact', 'menu_name' => 'footer', 'type' => MENU_SUGGESTED_ITEM, ); - return $items; + return $links; } /** diff --git a/core/modules/dblog/dblog.module b/core/modules/dblog/dblog.module index 7545b60..3bbf31a 100644 --- a/core/modules/dblog/dblog.module +++ b/core/modules/dblog/dblog.module @@ -84,29 +84,28 @@ function dblog_menu() { * Implements hook_default_menu_links(). */ function dblog_default_menu_links() { - $items['admin.reports.dblog'] = array( + $links['admin.reports.dblog'] = array( 'link_title' => 'Recent log messages', 'parent' => 'admin.reports', 'description' => 'View events that have recently been logged.', 'route_name' => 'dblog_overview', 'weight' => -1, ); - $items['admin.reports.page-not-found'] = array( + $links['admin.reports.page-not-found'] = array( 'link_title' => "Top 'page not found' errors", 'link_path' => 'admin/reports/page-not-found', 'parent' => 'admin.reports', 'description' => "View 'page not found' errors (404s).", ); - $items['admin.reports.access-denied'] = array( + $links['admin.reports.access-denied'] = array( 'link_title' => "Top 'access denied' errors", 'link_path' => 'admin/reports/access-denied', 'description' => "View 'access denied' errors (403s).", 'parent' => 'admin.reports', ); - if (module_exists('search')) { - $items['admin.reports.search'] = array( + $links['admin.reports.search'] = array( 'link_title' => 'Top search phrases', 'link_path' => 'admin/reports/search', 'description' => 'View most popular search phrases.', @@ -114,7 +113,7 @@ function dblog_default_menu_links() { ); } - return $items; + return $links; } /** diff --git a/core/modules/user/user.module b/core/modules/user/user.module index 43bbbef..4c55444 100644 --- a/core/modules/user/user.module +++ b/core/modules/user/user.module @@ -959,23 +959,22 @@ function user_menu() { */ function user_default_menu_links() { // Registration and login pages. - $items['user'] = array( - 'link_title' => 'User account', + $links['user'] = array( + 'link_title' => 'My account', 'weight' => -10, 'route_name' => 'user_page', 'menu_name' => 'account', ); - $items['user.logout'] = array( + $links['user.logout'] = array( 'link_title' => 'Log out', 'route_name' => 'user_logout', 'weight' => 10, 'menu_name' => 'account', - 'parent' => 'user', ); // User listing pages. - $items['admin.people'] = array( + $links['admin.people'] = array( 'link_title' => 'People', 'link_path' => 'admin/people', 'description' => 'Manage user accounts, roles, and permissions.', @@ -983,7 +982,7 @@ function user_default_menu_links() { 'weight' => -4, ); // Permissions and role forms. - $items['admin.people.permissions'] = array( + $links['admin.people.permissions'] = array( 'link_title' => 'Permissions', 'parent' => 'admin.people', 'description' => 'Determine access to features by selecting permissions for roles.', @@ -991,7 +990,7 @@ function user_default_menu_links() { ); // Administration pages. - $items['admin.config.people'] = array( + $links['admin.config.people'] = array( 'link_title' => 'People', 'link_path' => 'admin/config/people', 'parent' => 'admin.config', @@ -999,7 +998,7 @@ function user_default_menu_links() { 'weight' => -20, ); - $items['admin.config.people.accounts'] = array( + $links['admin.config.people.accounts'] = array( 'link_title' => 'Account settings', 'parent' => 'admin.config.people', 'description' => 'Configure default behavior of users, including registration requirements, e-mails, and fields.', @@ -1007,7 +1006,7 @@ function user_default_menu_links() { 'route_name' => 'user_account_settings', ); - return $items; + return $links; } /** @@ -1018,14 +1017,17 @@ function user_menu_link_presave(MenuLink $menu_link) { // for authenticated users. Authenticated users should see "My account", but // anonymous users should not see it at all. Therefore, invoke // user_menu_link_load() to conditionally hide the link. - if ($menu_link->link_path == 'user' && $menu_link->module == 'system') { + if ($menu_link->machine_name == 'user' && $menu_link->module == 'system') { $menu_link->options['alter'] = TRUE; } +} - // Force the Logout link to appear on the top-level of 'account' menu by - // default (i.e., unless it has been customized). - if ($menu_link->link_path == 'user/logout' && $menu_link->module == 'system' && empty($menu_link->customized)) { - $menu_link->plid = 0; +/** + * Implements hook_menu_breadcrumb_alter(). + */ +function user_translated_menu_link_alter(&$link) { + if ($link['machine_name'] == 'user' && $GLOBALS['user']->isAnonymous()) { + $link['title'] = t('Log in'); } }