? 605926.patch
? sites/all/modules/devel
? sites/default/files
? sites/default/private
? sites/default/settings.php
Index: includes/menu.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/menu.inc,v
retrieving revision 1.362
diff -u -p -r1.362 menu.inc
--- includes/menu.inc	11 Nov 2009 08:28:50 -0000	1.362
+++ includes/menu.inc	14 Nov 2009 15:15:23 -0000
@@ -2158,8 +2158,10 @@ function menu_get_active_title() {
  */
 function menu_link_load($mlid) {
   if (is_numeric($mlid)) {
-    $query = db_select('menu_links', 'ml');
-    $query->leftJoin('menu_router', 'm', 'm.path = ml.router_path');
+    // This needs to be a RIGHT OUTER JOIN rather than a LEFT OUTER JOIN so that
+    // ml.weight is returned after, and overrides, m.weight.
+    $query = db_select('menu_router', 'm');
+    $query->rightJoin('menu_links', 'ml', 'm.path = ml.router_path');
     $query->fields('ml');
     $query->fields('m');
     $query->condition('ml.mlid', $mlid);