diff options
| -rw-r--r-- | modules/taxonomy/taxonomy.pages.inc | 14 | ||||
| -rw-r--r-- | modules/taxonomy/taxonomy.test | 8 |
2 files changed, 17 insertions, 5 deletions
diff --git a/modules/taxonomy/taxonomy.pages.inc b/modules/taxonomy/taxonomy.pages.inc index e4a6fad76..1af17db7e 100644 --- a/modules/taxonomy/taxonomy.pages.inc +++ b/modules/taxonomy/taxonomy.pages.inc @@ -29,11 +29,15 @@ function taxonomy_term_page($term) { drupal_set_breadcrumb($breadcrumb); drupal_add_feed('taxonomy/term/' . $term->tid . '/feed', 'RSS - ' . $term->name); - $build['term_heading'] = array( - '#prefix' => '<div class="term-listing-heading">', - '#suffix' => '</div>', - 'term' => taxonomy_term_view($term, 'full'), - ); + $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'), + ); + } 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 87cfb4011..af50e5346 100644 --- a/modules/taxonomy/taxonomy.test +++ b/modules/taxonomy/taxonomy.test @@ -566,6 +566,14 @@ class TaxonomyTermTestCase extends TaxonomyWebTestCase { $this->assertText($edit['name'], t('The randomly generated term name is present.')); $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.'); + // 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.'); + // Check that the term feed page is working. $this->drupalGet('taxonomy/term/' . $term->tid . '/feed'); |