Merge branch 'instance/fid' into instance/fid_bbi

module/finc/src/finc/RecordDriver/SolrDefaultFincTrait.php

@@ -164,8 +164,15 @@ trait SolrDefaultFincTrait
             if (is_null($settings)) return false;
             if ($settings instanceof Config) $settings = $settings->toArray();
             foreach ((array) $settings as $value) {
-                list($methodName, $methodReturn) = explode(':', $value);
-                if (in_array($methodReturn, (array) $this->tryMethod($methodName))) {
+                $conf = explode(':', $value);
+                $methodName = array_shift($conf);
+                if (empty($conf))
+                {
+                    return $methodName === 'enabled';
+                }
+                $methodReturn = array_shift($conf);
+                if (in_array($methodReturn, (array) $this->tryMethod($methodName)))
+                {
                     // as the current permission matches the current record,
                     // return it
                     return true;

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

@@ -63,7 +63,7 @@ class ResultFeed extends \VuFind\View\Helper\Root\ResultFeed
         }
         $entry->setTitle(empty($title) ? $record->getBreadcrumb() : $title);
         $serverUrl = $this->getView()->plugin('serverurl');
-        $recordLink = $this->getView()->plugin('recordlink');
+        $recordLink = $this->getView()->plugin('recordLink');
         try {
             $url = $serverUrl($recordLink->getUrl($record));
         } catch (\Zend\Mvc\Router\Exception\RuntimeException $e) {