Merge branch 'instance/fid' into instance/fid_bbi

module/fid/src/AjaxHandler/GetResolverLinks.php

@@ -124,6 +124,20 @@ class GetResolverLinks extends \VuFind\AjaxHandler\GetResolverLinks
             }
             $result = $resolver->fetchLinks($openUrl);
 
+            if (isset($result['messages'])) {
+                $messages =  array_unique($result['messages']);
+                unset($result['messages']);
+            } else {
+                $messages = [];
+            }
+
+            if (isset($result['stateOfResults'])) {
+                $stateOfResults = $result['stateOfResults'];
+                unset($result['stateOfResults']);
+            } else {
+                $stateOfResults = [];
+            }
+
             // Sort the returned links into categories based on service type:
             $electronic = $print = $services = [];
             foreach ($result as $link) {
@@ -146,8 +160,6 @@ class GetResolverLinks extends \VuFind\AjaxHandler\GetResolverLinks
                 }
             }
 
-            $messages = isset($result['messages']) ? array_unique($result['messages']) : [];
-
             // Get the OpenURL base:
             if (isset($this->resolverConfig->$requestedResolver)
                 && isset($this->resolverConfig->$requestedResolver->url)
@@ -177,7 +189,7 @@ class GetResolverLinks extends \VuFind\AjaxHandler\GetResolverLinks
                 'messages' => $messages
             ];
             $viewButton = [
-                'showOrderButton' => $result['stateOfResults'],
+                'showOrderButton' => $stateOfResults,
                 'recordId' => $recordId
             ];
         }