Project

General

Profile

« Previous | Next » 

Revision b648739e

Added by Andreas Kohlbecker almost 5 years ago

ref #8304 fixing problems with page arg evaluation

View differences:

modules/cdm_dataportal/cdm_dataportal.module
1727 1727
 * @return mixed
1728 1728
 *   The formatted name page as node.
1729 1729
 */
1730
function cdm_dataportal_name_page_view($taxon_name_uuid, $taxon_to_hide_uuid, $synonym_uuid = NULL, $redirect_to_taxon = '') {
1730
function cdm_dataportal_name_page_view($taxon_name_uuid, $taxon_to_hide_uuid, $synonym_uuid = NULL, $redirect_to_taxon = false) {
1731 1731

  
1732 1732
  cdm_check_valid_portal_page();
1733 1733

  
1734
  // redirect_to_taxon is a path element of the name page path, see path_to_name()
1735
  $do_redirect_to_taxon = $redirect_to_taxon == 'redirect_to_taxon';
1736
  $taxonname_page = cdm_dataportal_name_view($taxon_name_uuid, $taxon_to_hide_uuid, $do_redirect_to_taxon, $synonym_uuid);
1734
  $taxonname_page = cdm_dataportal_name_view(
1735
    is_uuid($taxon_name_uuid) ? $taxon_name_uuid : null,
1736
    is_uuid($taxon_to_hide_uuid) ? $taxon_to_hide_uuid : null,
1737
    $redirect_to_taxon == 'redirect_to_taxon',
1738
    is_uuid($synonym_uuid) ? $synonym_uuid : null);
1737 1739
  if (!empty($taxonname_page)) {
1738 1740
    return cdm_node_show(NODETYPE_NAME, $taxon_name_uuid, $taxonname_page->title, $taxonname_page->content);
1739 1741
  }

Also available in: Unified diff