diff options
author | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-20 04:03:51 +0000 |
---|---|---|
committer | Angie Byron <webchick@24967.no-reply.drupal.org> | 2010-11-20 04:03:51 +0000 |
commit | 1a91990cae84f045b774e0eb308334dea1e97b28 (patch) | |
tree | 8ce6d346117837a69d06850c132013eab6b3295d /includes/menu.inc | |
parent | aa10522336e69d462176e7505f3cdc00c3cf85d7 (diff) | |
download | brdo-1a91990cae84f045b774e0eb308334dea1e97b28.tar.gz brdo-1a91990cae84f045b774e0eb308334dea1e97b28.tar.bz2 |
#599706 follow-up by JohnAlbin, sun: Regression: Restore consistency to theme_menu_local_tasks() theme function
Diffstat (limited to 'includes/menu.inc')
-rw-r--r-- | includes/menu.inc | 37 |
1 files changed, 25 insertions, 12 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 9d3fef979..b72e3ff90 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -2132,22 +2132,35 @@ function menu_tab_root_path() { } /** - * Returns renderable local tasks. + * Returns a renderable element for the primary and secondary tabs. + */ +function menu_local_tabs() { + return array( + '#theme' => 'menu_local_tasks', + '#primary' => menu_primary_local_tasks(), + '#secondary' => menu_secondary_local_tasks(), + ); +} + +/** + * Returns HTML for primary and secondary local tasks. * * @ingroup themeable */ -function theme_menu_local_tasks() { - $output = array(); +function theme_menu_local_tasks(&$variables) { + $output = ''; - if ($primary = menu_primary_local_tasks()) { - $primary['#prefix'] = '<h2 class="element-invisible">' . t('Primary tabs') . '</h2><ul class="tabs primary">'; - $primary['#suffix'] = '</ul>'; - $output[] = $primary; - } - if ($secondary = menu_secondary_local_tasks()) { - $secondary['#prefix'] = '<h2 class="element-invisible">' . t('Secondary tabs') . '</h2><ul class="tabs secondary">'; - $secondary['#suffix'] = '</ul>'; - $output[] = $secondary; + if (!empty($variables['primary'])) { + $variables['primary']['#prefix'] = '<h2 class="element-invisible">' . t('Primary tabs') . '</h2>'; + $variables['primary']['#prefix'] .= '<ul class="tabs primary">'; + $variables['primary']['#suffix'] = '</ul>'; + $output .= drupal_render($variables['primary']); + } + if (!empty($variables['secondary'])) { + $variables['secondary']['#prefix'] = '<h2 class="element-invisible">' . t('Secondary tabs') . '</h2>'; + $variables['secondary']['#prefix'] .= '<ul class="tabs secondary">'; + $variables['secondary']['#suffix'] = '</ul>'; + $output .= drupal_render($variables['secondary']); } return $output; |