? devel_7--1_1071200_4.patch Index: devel_node_access.module =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/devel/devel_node_access.module,v retrieving revision 1.64 diff -u -p -r1.64 devel_node_access.module --- devel_node_access.module 15 Jan 2011 20:16:49 -0000 1.64 +++ devel_node_access.module 24 Feb 2011 02:52:27 -0000 @@ -504,6 +504,9 @@ function devel_node_access_block_view($d if (!user_access(DNA_ACCESS_VIEW)) { return; } + + $output = array(); + switch ($delta) { case 'dna_node': if (!count(dna_visible_nodes())) { @@ -536,7 +539,13 @@ function devel_node_access_block_view($d implode('
', $explained), ); } - $output = theme('table', array('header' => $headers, 'rows' => $rows, 'attributes' => array('style' => 'text-align: left'))); + $output[] = array( + '#theme' => 'table', + '#header' => $headers, + '#rows' => $rows, + '#attributes' => array('style' => 'text-align: left') + ); + $hint = t('To see more details enable debug mode.', array('@debug_mode' => url('admin/config/development/devel', array('fragment' => 'edit-devel-node-access')))) . (empty($hint) ? '' : ' ' . $hint); } else { @@ -838,23 +847,25 @@ function devel_node_access_block_view($d foreach ($rows as $i => $row) { $rows[$i] = _devel_node_access_format_row($row); } - $output = theme('table', array( - 'header' => $headers, - 'rows' => $rows, - 'attributes' => array( - 'class' => array('system-status-report'), - 'style' => 'text-align: left;', + + $output[] = array( + '#theme' => 'table', + '#header' => $headers, + '#rows' => $rows, + '#attributes' => array( + 'class' => array('system-status-report'), + 'style' => 'text-align: left;', ), - )); + ); - $output .= theme_form_element(array('element' => array( - '#description' => t('(Some of the table elements provide additional information if you hover your mouse over them.)'), - '#children' => NULL, - ))); + $output[] = array( + '#theme' => 'form_element', + '#description' => t('(Some of the table elements provide additional information if you hover your mouse over them.)'), + ); if ($error_count > 0) { $variables['!Rebuild_permissions'] = '' . $tr('Rebuild permissions') . ''; - $output .= "\n
" . t("You have errors in your !na table! You may be able to fix these for now by running !Rebuild_permissions, but this is likely to destroy the evidence and make it impossible to identify the underlying issues. If you don't fix those, the errors will probably come back again.
DON'T do this just yet if you intend to ask for help with this situation.", $variables) . "

\n"; + $output[]['#markup'] = "\n
" . t("You have errors in your !na table! You may be able to fix these for now by running !Rebuild_permissions, but this is likely to destroy the evidence and make it impossible to identify the underlying issues. If you don't fix those, the errors will probably come back again.
DON'T do this just yet if you intend to ask for help with this situation.", $variables) . "

\n"; } // Explain whether access is granted or denied, and why (using code from node_access()). @@ -868,12 +879,12 @@ function devel_node_access_block_view($d if (user_access('bypass node access')) { $variables['%bypass_node_access'] = $tr('bypass node access'); - $output .= t('!username has the %bypass_node_access permission and thus full access to all nodes.', $variables) . '
 '; + $output[]['#markup'] = t('!username has the %bypass_node_access permission and thus full access to all nodes.', $variables) . '
 '; } else { $variables['!list'] = '
' . _devel_node_access_get_grant_list($nid, $ng_alter_data) . '
'; $variables['%access'] = 'view'; - $output .= "\n
" . t('!username (user %uid) can use these grants (if they are present above) for %access access: !list', $variables) . "
\n"; + $output[]['#markup'] = "\n
" . t('!username (user %uid) can use these grants (if they are present above) for %access access: !list', $variables) . "
\n"; $accounts[] = $user; } if (arg(0) == 'node' && is_numeric(arg(1)) && !$block1_visible) { // only for single nodes @@ -882,7 +893,7 @@ function devel_node_access_block_view($d } foreach ($accounts as $account) { $variables['!username'] = theme('username', array('account' => $account)); - $output .= "\n
" . t("!username has the following access", $variables) . ' '; + $output[]['#markup'] = "\n
" . t("!username has the following access", $variables) . ' '; $nid_items = array(); foreach ($nids as $nid) { $op_items = array(); @@ -890,32 +901,40 @@ function devel_node_access_block_view($d $explain = _devel_node_access_explain_access($op, $nid, $account); $op_items[] = "
" . t('%op:', array('%op' => $op)) . '
' . $explain[2]; } - $nid_items[] = t('to node !nid:', array('!nid' => l($nid, 'node/' . $nid))) - . "\n
" - . theme('item_list', array('items' => $op_items, 'type' => 'ul')) - . '
'; + $nid_items[] = array( + '#theme' => 'item_list', + '#items' => $op_items, + '#type' => 'ul', + '#prefix' => t('to node !nid:', array('!nid' => l($nid, 'node/' . $nid))) . "\n
", + '#suffix' => '
', + ); } if (count($nid_items) == 1) { - $output .= $nid_items[0]; + $output[] = $nid_items[0]; } else { - $output .= "\n
" - . theme('item_list', array('items' => $nid_items, 'type' => 'ul')) - . '
'; + $output[] = array( + '#theme' => 'item_list', + '#items' => $nid_items, + '#type' => 'ul', + '#prefix' => "\n
", + '#suffix' => '
', + ); } - $output .= "\n
\n"; + $output[]['#markup'] .= "\n
\n"; } } } if (!empty($hint)) { - $output .= theme_form_element(array('element' => array( - '#description' => '(' . $hint . ')', - '#children' => NULL, - ))); + $output[] = array( + '#theme' => 'form_element', + '#description' => '(' . $hint . ')', + ); } + $output[]['#markup'] = '

'; $subject = t('node_access entries for nodes shown on this page'); - return array('subject' => $subject, 'content' => $output . '

'); + return array('subject' => $subject, 'content' => $output); case 'dna_user': // show which users can access this node @@ -948,15 +967,17 @@ function devel_node_access_block_view($d ); } if (count($rows)) { - $output = theme('table', array( - 'header' => $headers, - 'rows' => $rows, - 'attributes' => array('style' => 'text-align: left'), - )); - $output .= theme_form_element(array('element' => array( - '#description' => t('(This table lists the most-recently active users. Hover your mouse over each result for more details.)'), - '#children' => NULL, - ))); + $output[] = array( + '#theme' => 'table', + '#header' => $headers, + '#rows' => $rows, + '#attributes' => array('style' => 'text-align: left'), + ); + $output[] = array( + '#theme' => 'form_element', + '#description' => t('(This table lists the most-recently active users. Hover your mouse over each result for more details.)'), + ); + return array( 'subject' => t('Access permissions by user'), 'content' => $output,