diff options
Diffstat (limited to 'modules/menu')
| -rw-r--r-- | modules/menu/menu.module | 2 | ||||
| -rw-r--r-- | modules/menu/menu.test | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/modules/menu/menu.module b/modules/menu/menu.module index 615548c1e..40614a162 100644 --- a/modules/menu/menu.module +++ b/modules/menu/menu.module @@ -632,7 +632,7 @@ function menu_form_node_form_alter(&$form, $form_state) { // menu_parent_options() is goofy and can actually handle either a menu link // or a node type both as second argument. Pick based on whether there is // a link already (menu_node_prepare() sets mlid default to 0). - $options = menu_parent_options(menu_get_menus(), $link['mlid'] ? $link : $type); + $options = menu_parent_options(menu_get_menus(), $link['mlid'] ? $link : $type, $type); // If no possible parent menu items were found, there is nothing to display. if (empty($options)) { return; diff --git a/modules/menu/menu.test b/modules/menu/menu.test index 44b5d687a..324ba6766 100644 --- a/modules/menu/menu.test +++ b/modules/menu/menu.test @@ -698,6 +698,8 @@ class MenuNodeTestCase extends DrupalWebTestCase { // Assert that it is not possible to set the parent of the first node to itself or the second node. $this->assertNoOption('edit-menu-parent', 'navigation:'. $item['mlid']); $this->assertNoOption('edit-menu-parent', 'navigation:'. $child_item['mlid']); + // Assert that unallowed Management menu is not available in options. + $this->assertNoOption('edit-menu-parent', 'management:0'); } /** |