diff --git a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php index 651276bb92e3faa6ec2c60bdd54d052a65eb0af1..4bc7155985271dc4de8616e857b744a807066f09 100644 --- a/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php +++ b/module/VuFind/src/VuFind/Hierarchy/TreeRenderer/JSTree.php @@ -176,7 +176,7 @@ class JSTree extends AbstractBase 'recordid' => $node->id ], 'a_attr' => [ - 'href' => $this->getContextualUrl($node, $context, $hierarchyID), + 'href' => $this->getContextualUrl($node, $context), 'title' => $node->title ], 'type' => $node->type @@ -194,13 +194,12 @@ class JSTree extends AbstractBase /** * Use the router to build the appropriate URL based on context * - * @param object $node JSON object of a node/top node - * @param string $context Record or Collection - * @param string $collectionID Collection ID + * @param object $node JSON object of a node/top node + * @param string $context Record or Collection * * @return string */ - protected function getContextualUrl($node, $context, $collectionID) + protected function getContextualUrl($node, $context) { if ($context == 'Collection') { return $this->getUrlFromRouteCache('collection', $node->id) @@ -257,7 +256,7 @@ class JSTree extends AbstractBase $name = strlen($node->title) > 100 ? substr($node->title, 0, 100) . '...' : $node->title; - $href = $this->getContextualUrl($node, $context, $hierarchyID); + $href = $this->getContextualUrl($node, $context); $icon = $node->type == 'record' ? 'file-o' : 'folder-open'; $html = '<li'; diff --git a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php index c55d746854a197f56003477352c826a1e71c0adb..b364ff1c67cfb7fe504f82a312e9f8fc6fd73922 100644 --- a/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php +++ b/module/VuFindDevTools/src/VuFindDevTools/Controller/DevtoolsController.php @@ -148,11 +148,9 @@ class DevtoolsController extends \VuFind\Controller\AbstractBase /** * Get text domains for a language. * - * @param string $lang Language to load - * * @return array */ - protected function getTextDomains($lang) + protected function getTextDomains() { static $domains = false; if (!$domains) { @@ -182,7 +180,7 @@ class DevtoolsController extends \VuFind\Controller\AbstractBase protected function loadLanguage(ExtendedIni $loader, $lang) { $base = $loader->load($lang, null); - foreach ($this->getTextDomains($lang) as $domain) { + foreach ($this->getTextDomains() as $domain) { $current = $loader->load($lang, $domain); foreach ($current as $k => $v) { if ($k != '@parent_ini') {