Rearranged configuration to get VuFind-specific components out of global configuration namespace.

module/VuFind/src/VuFind/Bootstrap.php

@@ -94,10 +94,11 @@ class Bootstrap
             $serviceName = 'VuFind\\' . str_replace('\\', '', $ns) . 'PluginManager';
             $factory = function ($sm) use ($config, $ns) {
                 $className = 'VuFind\\' . $ns . '\PluginManager';
-                $configKey = strtolower(str_replace('\\', '_', $ns))
-                    . '_plugin_manager';
+                $configKey = strtolower(str_replace('\\', '_', $ns));
                 return new $className(
-                    new \Zend\ServiceManager\Config($config[$configKey])
+                    new \Zend\ServiceManager\Config(
+                        $config['vufind']['plugin_managers'][$configKey]
+                    )
                 );
             };
             $serviceManager->setFactory($serviceName, $factory);
@@ -106,7 +107,7 @@ class Bootstrap
         // Set up search manager a little differently -- it is a more complex class
         // that doesn't work like the other standard plugin managers.
         $factory = function ($sm) use ($config) {
-            return new \VuFind\Search\Manager($config['search_manager']);
+            return new \VuFind\Search\Manager($config['vufind']['search_manager']);
         };
         $serviceManager->setFactory('SearchManager', $factory);
 

module/VuFind/src/VuFind/Controller/AbstractRecord.php

@@ -542,7 +542,7 @@ class AbstractRecord extends AbstractBase
     protected function getTabConfiguration()
     {
         $cfg = $this->getServiceLocator()->get('Config');
-        return $cfg['recorddriver_tabs'];
+        return $cfg['vufind']['recorddriver_tabs'];
     }
 
     /**

module/VuFind/src/VuFind/Controller/AuthorityController.php

@@ -74,12 +74,13 @@ class AuthorityController extends AbstractSearch
     {
         $id = $this->params()->fromQuery('id');
         $cfg = $this->getServiceLocator()->get('Config');
+        $tabConfig = $cfg['vufind']['recorddriver_tabs'];
         $driver = $this->getSearchManager()->setSearchClassId('SolrAuth')
             ->getResults()->getRecord($id);
         $request = $this->getRequest();
         $tabs = $this->getServiceLocator()
             ->get('VuFind\RecordTabPluginManager')
-            ->getTabsForRecord($driver, $cfg['recorddriver_tabs'], $request);
+            ->getTabsForRecord($driver, $tabConfig, $request);
         return $this->createViewModel(array('driver' => $driver, 'tabs' => $tabs));
     }