Index: modules/taxonomy/taxonomy.pages.inc =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.pages.inc,v retrieving revision 1.52 diff -u -p -r1.52 taxonomy.pages.inc --- modules/taxonomy/taxonomy.pages.inc 3 Aug 2010 02:02:02 -0000 1.52 +++ modules/taxonomy/taxonomy.pages.inc 22 Aug 2010 10:41:41 -0000 @@ -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' => '
', - '#suffix' => '
', - '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' => '
', + '#suffix' => '
', + '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); Index: modules/taxonomy/taxonomy.test =================================================================== RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.test,v retrieving revision 1.88 diff -u -p -r1.88 taxonomy.test --- modules/taxonomy/taxonomy.test 8 Aug 2010 02:06:56 -0000 1.88 +++ modules/taxonomy/taxonomy.test 22 Aug 2010 10:41:42 -0000 @@ -566,6 +566,14 @@ class TaxonomyTermTestCase extends Taxon $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');