Project

General

Profile

« Previous | Next » 

Revision 963f9de3

Added by Andreas Kohlbecker over 2 years ago

ref #8543 replacing theme_cdm_footnote_key() by cdm_footnote_key()

View differences:

modules/cdm_dataportal/includes/name.inc
984 984
          // footnotes should be rendered in the parent element so we
985 985
          // are relying on the FootnoteListKey set there
986 986
          $_fkey2 = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $citation_footnote_str);
987
          $footnote_key_markup = theme('cdm_footnote_key', array(
988
            'footnoteKey' => $_fkey2,
989
            'separator' => $separator,
990
            'highlightable' => TRUE,
991
            'separator_off' => TRUE,
992
          ));
993

  
987
          $footnote_key_markup = cdm_footnote_key($_fkey2, $separator, TRUE);
994 988
        }
995 989

  
996 990
        $type_citation_markup .= '&nbsp;(' . t('designated by') . '&nbsp;<span class="typeReference">' . $authorteam_str . '</span>';
......
1070 1064
    RenderHints::getFootnoteListKey(),
1071 1065
    (isset($derivedUnitFacadeInstance->collection->titleCache) ? $derivedUnitFacadeInstance->collection->titleCache : FALSE)
1072 1066
  );
1073
  $out .= theme('cdm_footnote_key', array('footnoteKey' => $_fkey, 'separator' => $separator));
1067
  $out .= cdm_footnote_key($_fkey, $separator);
1074 1068
  $out .= '</' . $enclosing_tag .'>';
1075 1069

  
1076 1070
  RenderHints::popFromRenderStack();
......
1596 1590
  }
1597 1591
  if ($footnote_markup) {
1598 1592
    $fnkey = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $footnote_markup);
1599
    $footnote_key_markup = theme('cdm_footnote_key', array(
1600
      'footnoteKey' => $fnkey,
1601
      'separator' => ',',
1602
      'highlightable' => TRUE,
1603
      'separator_off' => TRUE,
1604
    ));
1593
    $footnote_key_markup = cdm_footnote_key($fnkey,, ',',TRUE);
1605 1594
  }
1606 1595
  return $footnote_key_markup;
1607 1596
}
......
1633 1622
  }
1634 1623
  if ($footnote_markup) {
1635 1624
    $fnkey = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $footnote_markup);
1636
    $footnote_key_markup = theme('cdm_footnote_key', array(
1637
      'footnoteKey' => $fnkey,
1638
      'separator' => ',',
1639
      'highlightable' => TRUE,
1640
      'separator_off' => TRUE,
1641
    ));
1625
    $footnote_key_markup = cdm_footnote_key($fnkey, ',',TRUE);
1642 1626
  }
1643 1627
  return $footnote_key_markup;
1644 1628
}
......
2006 1990
    // footnotes should be rendered in the parent element so we
2007 1991
    // are relying on the FootnoteListKey set there
2008 1992
    $fkey_typeDesignation = FootnoteManager::addNewFootnote(RenderHints::getFootnoteListKey(), $typeDesignation->citation->titleCache);
2009
    $res .= theme('cdm_footnote_key', array(
2010
        'footnoteKey' => $fkey_typeDesignation,
2011
        'separator' => $footnote_separator,
2012
        'highlightable' => TRUE,
2013
        'separator_off' => TRUE,
2014
      )) . ')';
1993
    $res .= cdm_footnote_key($fkey_typeDesignation, $footnote_separator,TRUE) . ')';
2015 1994
  }
2016 1995
  return $res;
2017 1996
}

Also available in: Unified diff