From 17d30dc3a37c9eb524d601a34004efc92322d984 Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Fri, 8 Oct 2010 05:28:30 +0000
Subject: #925778 by mradcliffe, chx, sun, manarth: Fixed user edit title
 incorrectly shows currently logged in user.

---
 modules/system/system.install | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

(limited to 'modules/system/system.install')

diff --git a/modules/system/system.install b/modules/system/system.install
index 4e6703148..eae01725f 100644
--- a/modules/system/system.install
+++ b/modules/system/system.install
@@ -1978,11 +1978,23 @@ function system_update_7015() {
     ->fields(array('link_path' => 'user/logout'))
     ->condition('link_path', 'logout')
     ->execute();
-
- db_update('menu_links')
+  db_update('menu_links')
     ->fields(array('router_path' => 'user/logout'))
     ->condition('router_path', 'logout')
     ->execute();
+
+  db_update('menu_links')
+    ->fields(array(
+      'menu_name' => 'user-menu',
+      'plid' => 0,
+    ))
+    ->condition(db_or()
+      ->condition('link_path', 'user/logout')
+      ->condition('router_path', 'user/logout')
+    )
+    ->condition('module', 'system')
+    ->condition('customized', 0)
+    ->execute();
 }
 
 /**
-- 
cgit v1.2.3