From 0edd27cb1598db329bc9fa4b912cb1d014308c18 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 8 May 2011 15:37:54 -0400
Subject: [PATCH] - Patch #796692 by dman, cross, andypost, aaronbauman, yched,
BarisW: only show the term heading if the term has a description.
---
modules/taxonomy/taxonomy.module | 16 ++++++++++------
modules/taxonomy/taxonomy.pages.inc | 14 ++++++--------
modules/taxonomy/taxonomy.test | 4 ++--
3 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index d14a169c875e..f08df601e3b7 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -694,12 +694,15 @@ function taxonomy_term_view($term, $view_mode = 'full', $langcode = NULL) {
$build += field_attach_view('taxonomy_term', $term, $view_mode, $langcode);
- $build['description'] = array(
- '#markup' => check_markup($term->description, $term->format, '', TRUE),
- '#weight' => 0,
- '#prefix' => '<div class="taxonomy-term-description">',
- '#suffix' => '</div>',
- );
+ // Add term description if the term has one.
+ if (!empty($term->description)) {
+ $build['description'] = array(
+ '#markup' => check_markup($term->description, $term->format, '', TRUE),
+ '#weight' => 0,
+ '#prefix' => '<div class="taxonomy-term-description">',
+ '#suffix' => '</div>',
+ );
+ }
$build['#attached']['css'][] = drupal_get_path('module', 'taxonomy') . '/taxonomy.css';
@@ -727,6 +730,7 @@ function template_preprocess_taxonomy_term(&$variables) {
$variables = array_merge((array) $term, $variables);
// Helpful $content variable for templates.
+ $variables['content'] = array();
foreach (element_children($variables['elements']) as $key) {
$variables['content'][$key] = $variables['elements'][$key];
}
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc
index 25cf642df102..3aed29011eab 100644
--- a/modules/taxonomy/taxonomy.pages.inc
+++ b/modules/taxonomy/taxonomy.pages.inc
@@ -31,14 +31,12 @@ function taxonomy_term_page($term) {
drupal_add_feed('taxonomy/term/' . $term->tid . '/feed', 'RSS - ' . $term->name);
$build = array();
- // Add term heading if the term has a description
- if (!empty($term->description)) {
- $build['term_heading'] = array(
- '#prefix' => '<div class="term-listing-heading">',
- '#suffix' => '</div>',
- 'term' => taxonomy_term_view($term, 'full'),
- );
- }
+
+ $build['term_heading'] = array(
+ '#prefix' => '<div class="term-listing-heading">',
+ '#suffix' => '</div>',
+ 'term' => taxonomy_term_view($term, 'full'),
+ );
if ($nids = taxonomy_select_nodes($term->tid, TRUE, variable_get('default_nodes_main', 10))) {
$nodes = node_load_multiple($nids);
diff --git a/modules/taxonomy/taxonomy.test b/modules/taxonomy/taxonomy.test
index a6ac332dcf82..1fd47f5ea990 100644
--- a/modules/taxonomy/taxonomy.test
+++ b/modules/taxonomy/taxonomy.test
@@ -648,12 +648,12 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase {
$this->assertText($edit['description[value]'], t('The randomly generated term description is present.'));
// Did this page request display a 'term-listing-heading'?
- $this->assertPattern('|class="term-listing-heading"|', 'Term page displayed the term description element.');
+ $this->assertPattern('|class="taxonomy-term-description"|', 'Term page displayed the term description element.');
// Check that it does NOT show a description when description is blank.
$term->description = '';
taxonomy_term_save($term);
$this->drupalGet('taxonomy/term/' . $term->tid);
- $this->assertNoPattern('|class="term-listing-heading"|', 'Term page did not display the term description when description was blank.');
+ $this->assertNoPattern('|class="taxonomy-term-description"|', 'Term page did not display the term description when description was blank.');
// Check that the term feed page is working.
$this->drupalGet('taxonomy/term/' . $term->tid . '/feed');
--
GitLab