Skip to content
Snippets Groups Projects
Commit f5205fda authored by Dorian Merz's avatar Dorian Merz
Browse files

Merge branch 'master-v5' into instance/fid

parents 20f1c28e 48a618d7
No related merge requests found
......@@ -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;
......
......@@ -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) {
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment