tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-24 14:24:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Change modulePath setting to module_path

Browse Source 
fixes #7694
This commit is contained in:
Johannes Meyer 2014-11-17 10:10:08 +01:00
parent 8d4089c22a
commit 812f9af949
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/forms/Config/General/ApplicationConfigForm.php
View File

@ -31,7 +31,7 @@ class ApplicationConfigForm extends Form
{ {
$this->addElement( $this->addElement(
'text', 'text',
'global_modulePath', 'global_module_path',
array( array(
'label' => t('Module Path'), 'label' => t('Module Path'),
'required' => true, 'required' => true,

2
application/forms/Config/GeneralConfigForm.php
View File

@ -41,7 +41,7 @@ class GeneralConfigForm extends ConfigForm
{ {
$sections = array(); $sections = array();
foreach ($this->getValues() as $sectionAndPropertyName => $value) { foreach ($this->getValues() as $sectionAndPropertyName => $value) {
list($section, $property) = explode('_', $sectionAndPropertyName); list($section, $property) = explode('_', $sectionAndPropertyName, 2);
if (! isset($sections[$section])) { if (! isset($sections[$section])) {
$sections[$section] = array(); $sections[$section] = array();
} }

2
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -372,7 +372,7 @@ abstract class ApplicationBootstrap
$this->moduleManager = new ModuleManager( $this->moduleManager = new ModuleManager(
$this, $this,
$this->configDir . '/enabledModules', $this->configDir . '/enabledModules',
explode(':', $this->config->fromSection('global', 'modulePath', $this->baseDir . '/modules')) explode(':', $this->config->fromSection('global', 'module_path', $this->baseDir . '/modules'))
); );
return $this; return $this;
} }