diff --git a/module/VuFind/src/VuFind/RecordTab/TabManager.php b/module/VuFind/src/VuFind/RecordTab/TabManager.php index 760af483bd17f9ccfa384c950012901edcdedbd8..b0183502d050081d6c98fa145bc6c3e2d5fc4b5c 100644 --- a/module/VuFind/src/VuFind/RecordTab/TabManager.php +++ b/module/VuFind/src/VuFind/RecordTab/TabManager.php @@ -79,11 +79,12 @@ class TabManager protected $pluginManager; /** - * Overall framework configuration + * Overall framework configuration (used for fetching configurations "the old + * way" -- can eventually be deprecated). * * @var array */ - protected $zendConfig; + protected $legacyConfig; /** * Current active context (defaults to 'record') @@ -95,16 +96,17 @@ class TabManager /** * Constructor * - * @param PluginManager $pm RecordTab plugin manager - * @param ConfigManager $cm Configuration plugin manager - * @param array $zendConfig Zend Framework configuration + * @param PluginManager $pm RecordTab plugin manager + * @param ConfigManager $cm Configuration plugin manager + * @param array $legacyConfig Overall framework configuration (only + * used for legacy config loading; optional) */ public function __construct(PluginManager $pm, ConfigManager $cm, - $zendConfig = [] + $legacyConfig = [] ) { $this->pluginManager = $pm; $this->configManager = $cm; - $this->zendConfig = $zendConfig; + $this->legacyConfig = $legacyConfig; // Initialize default context. $this->initializeCurrentContext(); @@ -137,7 +139,7 @@ class TabManager if (!isset($this->config[$this->context])) { $key = $this->contextSettings[$this->context]['legacyConfigSection'] ?? 'recorddriver_tabs'; - $legacyConfig = $this->zendConfig['vufind'][$key] ?? []; + $legacyConfig = $this->legacyConfig['vufind'][$key] ?? []; $iniConfig = $this->configManager->get( $this->contextSettings[$this->context]['configFile'] )->toArray();