Inject configuration.

module/VuFind/config/module.config.php

@@ -627,6 +627,7 @@ $config = array(
                 'factories' => array(
                     'collectionhierarchytree' => function ($sm) {
                         return new \VuFind\RecordTab\CollectionHierarchyTree(
+                            $sm->getServiceLocator()->get('VuFind\Config')->get('config'),
                             $sm->getServiceLocator()->get('VuFind\RecordLoader')
                         );
                     },
@@ -636,6 +637,11 @@ $config = array(
                             $searchManager->setSearchClassId('SolrCollection')->getResults()
                         );
                     },
+                    'hierarchytree' => function ($sm) {
+                        return new \VuFind\RecordTab\HierarchyTree(
+                            $sm->getServiceLocator()->get('VuFind\Config')->get('config')
+                        );
+                    },
                     'holdingsils' => function ($sm) {
                         // If VuFind is configured to suppress the holdings tab when the
                         // ILS driver specifies no holdings, we need to pass in a connection
@@ -654,7 +660,6 @@ $config = array(
                 'invokables' => array(
                     'description' => 'VuFind\RecordTab\Description',
                     'excerpt' => 'VuFind\RecordTab\Excerpt',
-                    'hierarchytree' => 'VuFind\RecordTab\HierarchyTree',
                     'holdingsworldcat' => 'VuFind\RecordTab\HoldingsWorldCat',
                     'map' => 'VuFind\RecordTab\Map',
                     'reviews' => 'VuFind\RecordTab\Reviews',

module/VuFind/src/VuFind/RecordTab/CollectionHierarchyTree.php

@@ -48,10 +48,13 @@ class CollectionHierarchyTree extends HierarchyTree
     /**
      * Constructor
      *
+     * @param \Zend\Config\Config   $config Configuration
      * @param \VuFind\Record\Loader $loader Record loader
      */
-    public function __construct(\VuFind\Record\Loader $loader)
-    {
+    public function __construct(\Zend\Config\Config $config,
+        \VuFind\Record\Loader $loader
+    ) {
+        parent::__construct($config);
         $this->loader = $loader;
     }
 

module/VuFind/src/VuFind/RecordTab/HierarchyTree.php

@@ -26,7 +26,6 @@
  * @link     http://vufind.org/wiki/vufind2:record_tabs Wiki
  */
 namespace VuFind\RecordTab;
-use VuFind\Config\Reader as ConfigReader;
 
 /**
  * HierarchyTree tab
@@ -53,6 +52,16 @@ class HierarchyTree extends AbstractBase
      */
     protected $config = null;
 
+    /**
+     * Constructor
+     *
+     * @param \Zend\Config\Config $config Configuration
+     */
+    public function __construct(\Zend\Config\Config $config)
+    {
+        $this->config = $config;
+    }
+
     /**
      * Get the VuFind configuration.
      *
@@ -60,9 +69,6 @@ class HierarchyTree extends AbstractBase
      */
     protected function getConfig()
     {
-        if (null === $this->config) {
-            $this->config = ConfigReader::getConfig();
-        }
         return $this->config;
     }