From bc012df10c7435a4a57382345fbdf1a6ef25f668 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Mon, 16 May 2011 22:09:57 -0700
Subject: [PATCH] - Patch #997408 by erikwebb, Jeff Burnz, JohnAlbin,
tim.plunkett: is always set.
---
includes/menu.inc | 18 +++++++-----------
modules/system/page.tpl.php | 2 +-
themes/bartik/templates/page.tpl.php | 4 ++--
themes/garland/page.tpl.php | 2 +-
4 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/includes/menu.inc b/includes/menu.inc
index 02370ac29a44..7e6104d37a35 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -2188,17 +2188,13 @@ function menu_local_tabs() {
function theme_menu_local_tasks(&$variables) {
$output = '';
- 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']);
+ if ($primary = drupal_render($variables['primary'])) {
+ $output .= '<h2 class="element-invisible">' . t('Primary tabs') . '</h2>';
+ $output .= '<ul class="tabs primary">' . $primary . '</ul>';
+ }
+ if ($secondary = drupal_render($variables['secondary'])) {
+ $output .= '<h2 class="element-invisible">' . t('Secondary tabs') . '</h2>';
+ $output .= '<ul class="tabs secondary">' . $secondary . '</ul>';
}
return $output;
diff --git a/modules/system/page.tpl.php b/modules/system/page.tpl.php
index 8ffe82aa6298..bee1a2c49fcc 100644
--- a/modules/system/page.tpl.php
+++ b/modules/system/page.tpl.php
@@ -122,7 +122,7 @@
<?php print render($title_prefix); ?>
<?php if ($title): ?><h1 class="title" id="page-title"><?php print $title; ?></h1><?php endif; ?>
<?php print render($title_suffix); ?>
- <?php if ($tabs): ?><div class="tabs"><?php print render($tabs); ?></div><?php endif; ?>
+ <?php if ($tabs = render($tabs)): ?><div class="tabs"><?php print $tabs; ?></div><?php endif; ?>
<?php print render($page['help']); ?>
<?php if ($action_links): ?><ul class="action-links"><?php print render($action_links); ?></ul><?php endif; ?>
<?php print render($page['content']); ?>
diff --git a/themes/bartik/templates/page.tpl.php b/themes/bartik/templates/page.tpl.php
index 7b0f99097a0e..ec8062454509 100644
--- a/themes/bartik/templates/page.tpl.php
+++ b/themes/bartik/templates/page.tpl.php
@@ -192,9 +192,9 @@
</h1>
<?php endif; ?>
<?php print render($title_suffix); ?>
- <?php if ($tabs): ?>
+ <?php if ($tabs = render($tabs)): ?>
<div class="tabs">
- <?php print render($tabs); ?>
+ <?php print $tabs; ?>
</div>
<?php endif; ?>
<?php print render($page['help']); ?>
diff --git a/themes/garland/page.tpl.php b/themes/garland/page.tpl.php
index 326255cd4ef8..cc72b0829242 100644
--- a/themes/garland/page.tpl.php
+++ b/themes/garland/page.tpl.php
@@ -46,7 +46,7 @@
<h1<?php print $tabs ? ' class="with-tabs"' : '' ?>><?php print $title ?></h1>
<?php endif; ?>
<?php print render($title_suffix); ?>
- <?php if ($tabs): ?><?php print render($tabs); ?></div><?php endif; ?>
+ <?php if ($tabs = render($tabs)): ?><?php print $tabs; ?></div><?php endif; ?>
<?php print render($tabs2); ?>
<?php print $messages; ?>
<?php print render($page['help']); ?>
--
GitLab