diff options
author | David Rothstein <drothstein@gmail.com> | 2013-12-29 15:32:28 -0500 |
---|---|---|
committer | David Rothstein <drothstein@gmail.com> | 2013-12-29 15:32:28 -0500 |
commit | 257fac8454924bb2f09aaee6a112f9f86f7520f1 (patch) | |
tree | 7c0bc3b7730b203fba3c1ef0ce491cf5b2525315 /modules/menu | |
parent | 987892b79edcb3b2325fe551f261cd627c1f0e99 (diff) | |
download | brdo-257fac8454924bb2f09aaee6a112f9f86f7520f1.tar.gz brdo-257fac8454924bb2f09aaee6a112f9f86f7520f1.tar.bz2 |
Issue #1426122 by deletedaccount, Alan D., andypost, maximpodorov: Some callbacks return junk when calling drupal_not_found(); replace with return MENU_NOT_FOUND instead.
Diffstat (limited to 'modules/menu')
-rw-r--r-- | modules/menu/menu.admin.inc | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc index 68d8e12dc..66bd6f3b5 100644 --- a/modules/menu/menu.admin.inc +++ b/modules/menu/menu.admin.inc @@ -512,8 +512,7 @@ function menu_delete_menu_page($menu) { // System-defined menus may not be deleted. $system_menus = menu_list_system_menus(); if (isset($system_menus[$menu['menu_name']])) { - drupal_access_denied(); - return; + return MENU_ACCESS_DENIED; } return drupal_get_form('menu_delete_menu_confirm', $menu); } @@ -622,8 +621,7 @@ function menu_item_delete_page($item) { // Links defined via hook_menu may not be deleted. Updated items are an // exception, as they can be broken. if ($item['module'] == 'system' && !$item['updated']) { - drupal_access_denied(); - return; + return MENU_ACCESS_DENIED; } return drupal_get_form('menu_item_delete_form', $item); } |