Commit 5953ae2c authored by codycraven's avatar codycraven
Browse files

Merge branch '7.x-1.x' of git.drupal.org:project/taxonomy_display into 7.x-1.x

Conflicts:
	CHANGELOG.txt
parents dcb5e1ed 6e094d85
......@@ -2,6 +2,7 @@ Taxonomy Display 7.x-1.x, YYYY-MM-DD
------------------------------------
Issue #1817970 by codycraven, moltra: Fix fatal error in associated core when
number of entities set to 0.
Issue #1507630 by codycraven: Check for custom display setting before altering.
Issue #1798169 by tmsimont, lotyrin, codycraven: Added ignore breadcrumb plugin
to allow other modules to set the breadcrumb.
Issue #1811426 by Moloc: Fix term name not used as page title when menu item
......
......@@ -349,6 +349,14 @@ function taxonomy_display_save_taxonomy_display($machine_name, $save_data = arra
* The page content.
*/
function taxonomy_display_taxonomy_term_page($term) {
// Ensure custom display settings for taxonomy term page are enabled before
// altering.
$view_mode = field_view_mode_settings('taxonomy_term', $term->vocabulary_machine_name);
if (empty($view_mode['full']['custom_settings'])) {
module_load_include('inc', 'taxonomy', 'taxonomy.pages');
return taxonomy_term_page($term);
}
// Expose our $term object to altering.
drupal_alter('taxonomy_display_term_page_term_object', $term);
......
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