From 833ab255e92b5a8a1e9294282a4851c58d26a25f Mon Sep 17 00:00:00 2001
From: Angie Byron <webchick@24967.no-reply.drupal.org>
Date: Wed, 17 Feb 2010 05:46:16 +0000
Subject: =?UTF-8?q?#605926=20by=20jim0203,=20sun,=20jhodgdon,=20dman,=20ei?=
 =?UTF-8?q?leenmcnaughton,=20G=C3=A1bor=20Hojtsy:=20Fixed=20Menu=20link=20?=
 =?UTF-8?q?weight=20changes=20when=20editing=20a=20node.=20(with=20tests)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 includes/menu.inc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'includes')

diff --git a/includes/menu.inc b/includes/menu.inc
index 5362aafd9..83d36aa7b 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2194,7 +2194,8 @@ function menu_link_load($mlid) {
     $query = db_select('menu_links', 'ml');
     $query->leftJoin('menu_router', 'm', 'm.path = ml.router_path');
     $query->fields('ml');
-    $query->fields('m');
+    // Weight should be taken from {menu_links}, not {menu_router}.
+    $query->fields('m', array_diff(drupal_schema_fields_sql('menu_router'), array('weight')));
     $query->condition('ml.mlid', $mlid);
     if ($item = $query->execute()->fetchAssoc()) {
       _menu_link_translate($item);
-- 
cgit v1.2.3