From f7548361a664b6cb2fffc4e23a2a1a6620addd80 Mon Sep 17 00:00:00 2001
From: David Rothstein <drothstein@gmail.com>
Date: Sat, 10 Oct 2015 19:52:22 -0400
Subject: Issue #1973262 by cilefen, Matt V., David_Rothstein, Anybody, Rob230:
 User pages display incorrect title instead of "Menu link title" when link
 paths are added to a default menus

---
 includes/menu.inc      | 24 ++++++++++++++++++++++--
 modules/menu/menu.test | 11 +++++++++++
 2 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/includes/menu.inc b/includes/menu.inc
index 0e9c977c6..eb623a936 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2613,10 +2613,30 @@ function menu_get_active_breadcrumb() {
  */
 function menu_get_active_title() {
   $active_trail = menu_get_active_trail();
+  $local_task_title = NULL;
 
   foreach (array_reverse($active_trail) as $item) {
-    if (!(bool) ($item['type'] & MENU_IS_LOCAL_TASK)) {
-      return $item['title'];
+    // Local task titles are displayed as tabs and therefore should not be
+    // repeated as the page title. However, if the local task appears in a
+    // top-level menu, it is no longer a "local task" anymore (the front page
+    // of the site does not have tabs) so it is better to use the local task
+    // title in that case than to fall back on the front page link in the
+    // active trail (which is usually "Home" and would not make sense in this
+    // context).
+    if ((bool) ($item['type'] & MENU_IS_LOCAL_TASK)) {
+      // A local task title is being skipped; track it in case it needs to be
+      // used later.
+      $local_task_title = $item['title'];
+    }
+    else {
+      // This is not a local task, so use it for the page title (unless the
+      // conditions described above are met).
+      if (isset($local_task_title) && isset($item['href']) && $item['href'] == '<front>') {
+        return $local_task_title;
+      }
+      else {
+        return $item['title'];
+      }
     }
   }
 }
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index a9bdb5f27..8e69efe55 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -72,6 +72,17 @@ class MenuTestCase extends DrupalWebTestCase {
     $saved_item = menu_link_load($item['mlid']);
     $this->assertEqual($description, $saved_item['options']['attributes']['title'], 'Saving an existing link updates the description (title attribute)');
     $this->resetMenuLink($item, $old_title);
+
+    // Test that the page title is correct when a local task appears in a
+    // top-level menu item. See https://www.drupal.org/node/1973262.
+    $item = $this->addMenuLink(0, 'user/register', 'user-menu');
+    $this->drupalGet('user/password');
+    $this->assertNoTitle('Home | Drupal');
+    $this->drupalLogout();
+    $this->drupalGet('user/register');
+    $this->assertTitle($item['link_title'] . ' | Drupal');
+    $this->drupalGet('user');
+    $this->assertNoTitle('Home | Drupal');
   }
 
   /**
-- 
cgit v1.2.3