diff --git a/media_gallery.module b/media_gallery.module index eceb654..6a9eb4f 100644 --- a/media_gallery.module +++ b/media_gallery.module @@ -184,11 +184,21 @@ function media_gallery_mg_item_load($fid, $nid) { */ function media_gallery_menu_alter(&$items) { // Take over taxonomy term list pages by substituting our own callback. - // TODO: Use hook_entity_info_alter() to change the entity uri callback for - // gallery collections only. - $items['taxonomy/term/%taxonomy_term']['page callback'] = 'media_gallery_list_galleries'; - $items['taxonomy/term/%taxonomy_term']['file'] = 'media_gallery.pages.inc'; - $items['taxonomy/term/%taxonomy_term']['module'] = 'media_gallery'; + // For legacy support, do not override the term view if page manager + // is already doing so + $skip_node_override = FALSE; + if (module_exists('page_manager')) { + if ($task = page_manager_get_task('term_view')) { + if (isset($task['disabled']) && !$task['disabled']) { + $skip_node_override = TRUE; + } + } + } + if (!$skip_node_override) { + $items['taxonomy/term/%taxonomy_term']['page callback'] = 'media_gallery_list_galleries'; + $items['taxonomy/term/%taxonomy_term']['file'] = 'media_gallery.pages.inc'; + $items['taxonomy/term/%taxonomy_term']['module'] = 'media_gallery'; + } // If you're viewing a media item in context somewhere (which we do inside // media gallery nodes), that means it's being used on your site, which means