Drupal
/
drupal
mirror of https://git.drupalcode.org/project/drupal.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#472160 by chx and Heine. Deny D6-style access elements.

5.x
Neil Drumm 2009-07-10 05:56:51 +00:00
parent ab452bb770
commit 77af453968
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.txt
View File

@ -2,6 +2,8 @@
Drupal 5.20-dev xxxx-xx-xx
-----------------------
- The 'access' element for hook_menu() now interprets Drupal 6 style values,
like array('access content').
Drupal 5.19, 2009-07-01
-----------------------

8
includes/menu.inc
View File

@ -1055,6 +1055,10 @@ function _menu_build() {
$temp_mid = -1;
foreach ($menu_item_list as $item) {
// Protect against D6 style access
if (isset($item['access']) && is_array($item['access']) && count($item['access']) == 1 && isset($item['access'][0]) && is_string($item['access'][0])) {
$item['access'] = FALSE;
}
if (!isset($item['path'])) {
$item['path'] = '';
}
@ -1225,6 +1229,10 @@ function _menu_append_contextual_items() {
$new_items = array();
foreach ($menu_item_list as $item) {
// Protect against D6 style access
if (isset($item['access']) && is_array($item['access']) && count($item['access']) == 1 && isset($item['access'][0]) && is_string($item['access'][0])) {
$item['access'] = FALSE;
}
if (isset($item['callback'])) {
$_menu['callbacks'][$item['path']] = array('callback' => $item['callback']);
if (isset($item['callback arguments'])) {