#328110 by marcingy, Damien Tournoud, swentel, and pwolanin: Fix error on admin/build/menu, and robustify the test so we catch stuff like this in the future.

3 files changed, 10 insertions, 7 deletions

diff --git a/includes/menu.inc b/includes/menu.inc
index fdcc1bf4e..2cd620770 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -1911,7 +1911,9 @@ function menu_link_save(&$item) {
   );
   $existing_item = FALSE;
   if (isset($item['mlid'])) {
-    $existing_item = db_fetch_array(db_query("SELECT * FROM {menu_links} WHERE mlid = %d", $item['mlid']));
+    if ($existing_item = db_fetch_array(db_query("SELECT * FROM {menu_links} WHERE mlid = %d", $item['mlid']))) {
+      $existing_item['options'] = unserialize($existing_item['options']);
+    }
   }
 
   if (isset($item['plid'])) {
@@ -2016,7 +2018,6 @@ function menu_link_save(&$item) {
       $item['router_path'] = _menu_find_router_path($menu, $item['link_path']);
     }
   }
-  $item['options'] = serialize($item['options']);
   // If every value in $existing_item is the same in the $item, there is no
   // reason to run the update queries or clear the caches. We use
   // array_diff_assoc() with the $existing_item as the first parameter
@@ -2032,7 +2033,7 @@ function menu_link_save(&$item) {
       $item['router_path'], $item['hidden'], $item['external'], $item['has_children'],
       $item['expanded'], $item['weight'],  $item['depth'],
       $item['p1'], $item['p2'], $item['p3'], $item['p4'], $item['p5'], $item['p6'], $item['p7'], $item['p8'], $item['p9'],
-      $item['module'],  $item['link_title'], $item['options'], $item['customized'], $item['mlid']);
+      $item['module'],  $item['link_title'], serialize($item['options']), $item['customized'], $item['mlid']);
     // Check the has_children status of the parent.
     _menu_update_parental_status($item);
     menu_cache_clear($menu_name);
diff --git a/modules/menu/menu.module b/modules/menu/menu.module
index cc2fcb69c..656a87a8a 100644
--- a/modules/menu/menu.module
+++ b/modules/menu/menu.module
@@ -154,11 +154,13 @@ function menu_theme() {
  */
 function menu_enable() {
   menu_rebuild();
-  $link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'"));
-  $link['router_path'] = 'admin/build/menu-customize/%';
-  $link['module'] = 'menu';
+  $base_link = db_fetch_array(db_query("SELECT mlid AS plid, menu_name from {menu_links} WHERE link_path = 'admin/build/menu' AND module = 'system'"));
+  $base_link['router_path'] = 'admin/build/menu-customize/%';
+  $base_link['module'] = 'menu';
   $result = db_query("SELECT * FROM {menu_custom}");
   while ($menu = db_fetch_array($result)) {
+    // $link is passed by reference to menu_link_save(), so we make a copy of $base_link.
+    $link = $base_link;
     $link['mlid'] = 0;
     $link['link_title'] = $menu['title'];
     $link['link_path'] = 'admin/build/menu-customize/' . $menu['menu_name'];
diff --git a/modules/menu/menu.test b/modules/menu/menu.test
index ac8bdcbef..68d79964e 100644
--- a/modules/menu/menu.test
+++ b/modules/menu/menu.test
@@ -24,7 +24,7 @@ class MenuTestCase extends DrupalWebTestCase {
   function setUp() {
     parent::setUp('menu');
     // Create users.
-    $this->big_user = $this->drupalCreateUser(array('administer blocks', 'administer menu', 'create article content'));
+    $this->big_user = $this->drupalCreateUser(array('access administration pages', 'administer blocks', 'administer menu', 'create article content'));
     $this->std_user = $this->drupalCreateUser(array());
   }