Commit b6eb3d4c authored by alexpott's avatar alexpott

Issue #2009658 by chrisjlee, helga.chb: Replace theme() with drupal_render() in menu module.

parent f7a22ec0
......@@ -288,8 +288,13 @@ function theme_menu_overview_form($variables) {
// Change the parent field to a hidden. This allows any value but hides the field.
$element['plid']['#type'] = 'hidden';
$indent = array(
'#theme' => 'indentation',
'#size' => $element['#item']['depth'] - 1,
);
$row = array();
$row[] = theme('indentation', array('size' => $element['#item']['depth'] - 1)) . drupal_render($element['title']);
$row[] = drupal_render($indent) . drupal_render($element['title']);
$row[] = array('data' => drupal_render($element['hidden']), 'class' => array('checkbox', 'menu-enabled'));
$row[] = drupal_render($element['weight']) . drupal_render($element['plid']) . drupal_render($element['mlid']);
$row[] = drupal_render($element['operations']);
......@@ -303,8 +308,18 @@ function theme_menu_overview_form($variables) {
if (empty($rows)) {
$rows[] = array(array('data' => $form['#empty_text'], 'colspan' => '7'));
}
$table = array(
'#theme' => 'table',
'#header' => $header,
'#rows' => $rows,
'#attributes' => array(
'id' => 'menu-overview',
),
);
$output .= drupal_render($form['inline_actions']);
$output .= theme('table', array('header' => $header, 'rows' => $rows, 'attributes' => array('id' => 'menu-overview')));
$output .= drupal_render($table);
$output .= drupal_render_children($form);
return $output;
}
......
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