Project

General

Profile

« Previous | Next » 

Revision 1c30a02b

Added by Andreas Kohlbecker over 2 years ago

ref #8543 fix missing footnoteListKey default fallback

View differences:

modules/cdm_dataportal/includes/footnotes.inc
65 65

  
66 66
  $sources = cdm_entity_sources_sorted($cdm_entity);
67 67

  
68
  if (!isset($footnote_list_key_suggestion) || !$footnote_list_key_suggestion) {
69
    $footnote_list_key_suggestion = RenderHints::getFootnoteListKey();
70
  }
71

  
68 72
  // Annotations as footnotes.
69 73
  $footnote_keys = cdm_entity_annotations_as_footnote_keys($cdm_entity, $footnote_list_key_suggestion);
70 74

  
......
75 79
    $original_source_footnote_tag = $bibliography_settings['enabled'] == 1 ? 'div' : null; // null will cause bibliography_footnote_list_key to use the default
76 80
  } else {
77 81
    $sources_footnote_list_key = $footnote_list_key_suggestion;
78
    if(!$sources_footnote_list_key) {
79
      RenderHints::getFootnoteListKey();
80
    }
81 82
    $original_source_footnote_tag = NULL;
82 83
  }
83 84

  
......
225 226
    return '';
226 227
  }
227 228

  
229
  if (!isset($footnote_list_key) || !$footnote_list_key) {
230
    $footnote_list_key = RenderHints::getFootnoteListKey();
231
  }
232

  
228 233
  $out = '<' . $element_tag . ' class="footnotes footnotes-' . $footnote_list_key . ' ">'
229 234
    . FootnoteManager::renderFootnoteList($footnote_list_key)
230 235
    . '</' . $element_tag . '>';

Also available in: Unified diff