diff --git a/module/VuFind/config/module.config.php b/module/VuFind/config/module.config.php index dbc0b60624b9b1956537ef2ff2ea26a81fa643fb..a6f7e0e1b91190ad4384d16f87949951fd96e4fc 100644 --- a/module/VuFind/config/module.config.php +++ b/module/VuFind/config/module.config.php @@ -174,7 +174,10 @@ $config = array( }, 'VuFind\Mailer' => 'VuFind\Mailer\Factory', 'VuFind\RecordRouter' => function ($sm) { - return new \VuFind\Record\Router($sm->get('VuFind\RecordLoader')); + return new \VuFind\Record\Router( + $sm->get('VuFind\RecordLoader'), + $sm->get('VuFind\Config')->get('config') + ); }, 'VuFind\RecordStats' => function ($sm) { return new \VuFind\Statistics\Record( diff --git a/module/VuFind/src/VuFind/Record/Router.php b/module/VuFind/src/VuFind/Record/Router.php index c38b74db0880e2428da3569bce170c4e684384a2..1da259d5d4cf3552bc3f2730659f03a82f9c1457 100644 --- a/module/VuFind/src/VuFind/Record/Router.php +++ b/module/VuFind/src/VuFind/Record/Router.php @@ -45,14 +45,23 @@ class Router */ protected $loader; + /** + * VuFind configuration + * + * @var \Zend\Config\Config + */ + protected $config; + /** * Constructor * * @param \VuFind\Record\Loader $loader Record loader */ - public function __construct(\VuFind\Record\Loader $loader) - { + public function __construct(\VuFind\Record\Loader $loader, + \Zend\Config\Config $config + ) { $this->loader = $loader; + $this->config = $config; } /** @@ -88,9 +97,8 @@ class Router // to check if the driver is actually a collection; if so, we should switch // routes. if ('record' == $route['route']) { - $config = \VuFind\Config\Reader::getConfig(); - if (isset($config->Collections->collections) - && $config->Collections->collections + if (isset($this->config->Collections->collections) + && $this->config->Collections->collections ) { if (!is_object($driver)) { list($source, $id) = explode('|', $driver, 2);