Commit 768faa98 authored by Dries's avatar Dries

- Patch #138703 by chx: Menu inheritance is wrong.

parent 2a2b7672
...@@ -758,9 +758,10 @@ function menu_rebuild() { ...@@ -758,9 +758,10 @@ function menu_rebuild() {
// Because access is checked for each visible parent as well, we only // Because access is checked for each visible parent as well, we only
// inherit if arguments were given without a callback. Otherwise the // inherit if arguments were given without a callback. Otherwise the
// inherited check would be identical to that of the parent. // inherited check would be identical to that of the parent. We do
if (!isset($item['access callback']) && isset($parent['access callback']) && !isset($parent['access inherited'])) { // not inherit from visible parents which are themselves inherited.
if (isset($item['access arguments']) || !$parent['_visible']) { if (!isset($item['access callback']) && isset($parent['access callback']) && !(isset($parent['access inherited']) && $parent['_visible'])) {
if (isset($item['access arguments'])) {
$item['access callback'] = $parent['access callback']; $item['access callback'] = $parent['access callback'];
} }
else { else {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment