Commit 39d67044 authored by Dries's avatar Dries

- Patch #796692 by cross, dman, aaronbauman, BarisW: only show the term...

- Patch #796692 by cross, dman, aaronbauman, BarisW: only show the term heading if the term has a description.
parent 4a7bb638
......@@ -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);
......
......@@ -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');
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment