summaryrefslogtreecommitdiff
path: root/themes/seven/template.php
diff options
context:
space:
mode:
authorAngie Byron <webchick@24967.no-reply.drupal.org>2010-11-20 04:03:51 +0000
committerAngie Byron <webchick@24967.no-reply.drupal.org>2010-11-20 04:03:51 +0000
commit1a91990cae84f045b774e0eb308334dea1e97b28 (patch)
tree8ce6d346117837a69d06850c132013eab6b3295d /themes/seven/template.php
parentaa10522336e69d462176e7505f3cdc00c3cf85d7 (diff)
downloadbrdo-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 'themes/seven/template.php')
-rw-r--r--themes/seven/template.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/themes/seven/template.php b/themes/seven/template.php
index 78d41f168..0b0afc192 100644
--- a/themes/seven/template.php
+++ b/themes/seven/template.php
@@ -27,8 +27,12 @@ function seven_preprocess_html(&$vars) {
* Override or insert variables into the page template.
*/
function seven_preprocess_page(&$vars) {
- $vars['primary_local_tasks'] = menu_primary_local_tasks();
- $vars['secondary_local_tasks'] = menu_secondary_local_tasks();
+ $vars['primary_local_tasks'] = $vars['tabs'];
+ unset($vars['primary_local_tasks']['#secondary']);
+ $vars['secondary_local_tasks'] = array(
+ '#theme' => 'menu_local_tasks',
+ '#secondary' => $vars['tabs']['#secondary'],
+ );
}
/**