diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/appconfig.php | 34 | ||||
| -rw-r--r-- | config/config.php | 4 |
2 files changed, 22 insertions, 16 deletions
diff --git a/config/appconfig.php b/config/appconfig.php index 9b3f80a1d..bef117da9 100644 --- a/config/appconfig.php +++ b/config/appconfig.php @@ -96,22 +96,24 @@ class AppConfig { */ public function registerNavigation() { if (array_key_exists('navigation', $this->config)) { - $nav =& $this->config['navigation']; - - $navConfig = [ - 'id' => $this->config['id'], - 'order' => $nav['order'], - 'name' => $nav['name'] - ]; - - $navConfig['href'] = $this->urlGenerator->linkToRoute( - $nav['route'] - ); - $navConfig['icon'] = $this->urlGenerator->imagePath( - $this->config['id'], $nav['icon'] - ); - - $this->navigationManager->add($navConfig); + $this->navigationManager->add(function () { + $nav =& $this->config['navigation']; + + $navConfig = [ + 'id' => $this->config['id'], + 'order' => $nav['order'], + 'name' => $nav['name'] + ]; + + $navConfig['href'] = $this->urlGenerator->linkToRoute( + $nav['route'] + ); + $navConfig['icon'] = $this->urlGenerator->imagePath( + $this->config['id'], $nav['icon'] + ); + + return $navConfig; + }); } } diff --git a/config/config.php b/config/config.php index c02a8872c..d9fe1569f 100644 --- a/config/config.php +++ b/config/config.php @@ -32,6 +32,10 @@ class Config { private $loggerParams; private $maxSize; private $exploreUrl; + private $proxyHost; + private $proxyPort; + private $proxyUser; + private $proxyPassword; public function __construct(Folder $fileSystem, |