diff options
author | Dries Buytaert <dries@buytaert.net> | 2007-12-26 19:02:24 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2007-12-26 19:02:24 +0000 |
commit | 2a1e980cdd92e327c0b72a59608138ff51e76bb4 (patch) | |
tree | d167ef6f9a222e0c17df015b73429caf6c63bfe6 /includes | |
parent | 67d64ffc5309e906974e88072ed5e0171bd28009 (diff) | |
download | brdo-2a1e980cdd92e327c0b72a59608138ff51e76bb4.tar.gz brdo-2a1e980cdd92e327c0b72a59608138ff51e76bb4.tar.bz2 |
- Patch #203509 by pwolanin, chx, cwgordon7 et al: fixed menu inheritenace.
Diffstat (limited to 'includes')
-rw-r--r-- | includes/menu.inc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 8020cf0f1..b94d1ee4e 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -2119,10 +2119,6 @@ function _menu_router_build($callbacks) { // Apply inheritance rules. foreach ($menu as $path => $v) { $item = &$menu[$path]; - if (!isset($item['access callback']) && isset($item['access arguments'])) { - // Default callback. - $item['access callback'] = 'user_access'; - } if (!$item['_tab']) { // Non-tab items. $item['tab_parent'] = ''; @@ -2164,6 +2160,10 @@ function _menu_router_build($callbacks) { } } } + if (!isset($item['access callback']) && isset($item['access arguments'])) { + // Default callback. + $item['access callback'] = 'user_access'; + } if (!isset($item['access callback']) || empty($item['page callback'])) { $item['access callback'] = 0; } |