Merge pull request #2919 from Icinga/bugfix/module-config-caching
Config: Fix cached loading of module config
This commit is contained in:
commit
b9ce8c3135
|
@ -416,13 +416,12 @@ class Config implements Countable, Iterator, Selectable
|
||||||
self::$modules[$modulename] = array();
|
self::$modules[$modulename] = array();
|
||||||
}
|
}
|
||||||
|
|
||||||
$moduleConfigs = self::$modules[$modulename];
|
if (! isset(self::$modules[$modulename][$configname]) || $fromDisk) {
|
||||||
if (! isset($moduleConfigs[$configname]) || $fromDisk) {
|
self::$modules[$modulename][$configname] = static::fromIni(
|
||||||
$moduleConfigs[$configname] = static::fromIni(
|
|
||||||
static::resolvePath('modules/' . $modulename . '/' . $configname . '.ini')
|
static::resolvePath('modules/' . $modulename . '/' . $configname . '.ini')
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
return $moduleConfigs[$configname];
|
return self::$modules[$modulename][$configname];
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue