Merge branch 'master' into instance/fid

module/finc/src/finc/View/Helper/Root/RecordDataFormatterFactory.php

@@ -193,10 +193,9 @@ class RecordDataFormatterFactory
                 ]
             ]
         );
-        $spec->setTemplateLine(
+        $spec->setLine(
             'Title',
-            'getTitleDetails',
-            'data-titleDetails.phtml'
+            'getTitleDetails'
         );
         $spec->setTemplateLine(
             'Dates of publication',
@@ -362,10 +361,9 @@ class RecordDataFormatterFactory
                 ]
             ]
         );
-        $spec->setTemplateLine(
+        $spec->setLine(
             'Title',
-            'getTitleDetails',
-            'data-titleDetails.phtml'
+            'getTitleDetails'
         );
         $spec->setTemplateLine(
             'Title Uniform',
@@ -838,10 +836,9 @@ class RecordDataFormatterFactory
                 ]
             ]
         );
-        $spec->setTemplateLine(
+        $spec->setLine(
             'Title',
-            'getTitleDetails',
-            'data-titleDetails.phtml'
+            'getTitleDetails'
         );
         $spec->setTemplateLine(
             'Title Uniform',

themes/finc/templates/RecordDriver/SolrMarc/data-linkViaFincId.phtml → themes/finc/templates/RecordDriver/DefaultRecord/data-linkViaFincId.phtml

 <!-- finc: RecordDriver - solrMarc - data-linkviafincid -->
 <?php if (!empty($data)): ?>
   <?php foreach ($data as $field): ?>
-    <?php if (isset($field['id']) || isset($field['text'])):
+    <?php if (
+            is_array($field)
+            && (isset($field['id']) || isset($field['text']))
+        ):
       $url = isset($field['id'])
         ? $this->url('record') . $field['id']
         : $this->record($this->driver)->getLink('title', $field['text']);

themes/finc/templates/RecordDriver/DefaultRecord/data-titleDetails.phtml

+<?php
+/** @deprecated since the else part is never active, this should be substituted by a
+ *  simple SpecLine (giving escapeHtml with <br/>) in the RecordDataFormatterFactory
+ */
+?>
 <!-- finc: RecordDriver - DefaultRecord - data-titleDetails -->
 <?php if (!empty($data)): ?>
   <?php $i = 0;