/[drupal]/drupal/includes/menu.inc
ViewVC logotype

Diff of /drupal/includes/menu.inc

Parent Directory Parent Directory | Revision Log Revision Log | View Revision Graph Revision Graph | View Patch Patch

revision 1.146.2.2 by drumm, Mon Feb 11 05:26:53 2008 UTC revision 1.146.2.3 by drumm, Fri Jul 10 05:56:51 2009 UTC
# Line 1  Line 1 
1  <?php  <?php
2  // $Id: menu.inc,v 1.146.2.1 2007/06/17 01:50:50 drumm Exp $  // $Id: menu.inc,v 1.146.2.2 2008/02/11 05:26:53 drumm Exp $
3    
4  /**  /**
5   * @file   * @file
# Line 1055  function _menu_build() { Line 1055  function _menu_build() {
1055    $temp_mid = -1;    $temp_mid = -1;
1056    
1057    foreach ($menu_item_list as $item) {    foreach ($menu_item_list as $item) {
1058        // Protect against D6 style access
1059        if (isset($item['access']) && is_array($item['access']) && count($item['access']) == 1 && isset($item['access'][0]) && is_string($item['access'][0])) {
1060          $item['access'] = FALSE;
1061        }
1062      if (!isset($item['path'])) {      if (!isset($item['path'])) {
1063        $item['path'] = '';        $item['path'] = '';
1064      }      }
# Line 1225  function _menu_append_contextual_items() Line 1229  function _menu_append_contextual_items()
1229    $new_items = array();    $new_items = array();
1230    
1231    foreach ($menu_item_list as $item) {    foreach ($menu_item_list as $item) {
1232        // Protect against D6 style access
1233        if (isset($item['access']) && is_array($item['access']) && count($item['access']) == 1 && isset($item['access'][0]) && is_string($item['access'][0])) {
1234          $item['access'] = FALSE;
1235        }
1236      if (isset($item['callback'])) {      if (isset($item['callback'])) {
1237        $_menu['callbacks'][$item['path']] = array('callback' => $item['callback']);        $_menu['callbacks'][$item['path']] = array('callback' => $item['callback']);
1238        if (isset($item['callback arguments'])) {        if (isset($item['callback arguments'])) {
Legend:
Removed from v.1.146.2.2  
changed lines
  Added in v.1.146.2.3
  ViewVC Help
Powered by ViewVC 1.1.3