strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Bugfixing Addon-config

Browse source
This commit is contained in:
Philipp Holzer 2019-02-04 02:06:15 +01:00
parent d6dd74690d
commit f2f8c97b7c
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Core/Config/ConfigCacheLoader.php
View file

@ -17,6 +17,11 @@ class ConfigCacheLoader
* @var string * @var string
*/ */
const SUBDIRECTORY = '/config/'; const SUBDIRECTORY = '/config/';
/**
* The addon sub-directory
* @var string
*/
const ADDONDIRECTORY = '/addon/';
private $baseDir; private $baseDir;
private $configDir; private $configDir;
@ -129,12 +134,17 @@ class ConfigCacheLoader
* ]; * ];
* *
* @param string $filename * @param string $filename
* @param bool $addon True, if a config for an addon should be loaded
* @return array The configuration * @return array The configuration
* @throws \Exception * @throws \Exception
*/ */
public function loadConfigFile($filename) public function loadConfigFile($filename, $addon = false)
{ {
if ($addon) {
$filepath = $this->baseDir . self::ADDONDIRECTORY . self::SUBDIRECTORY . $filename . ".config.php";
} else {
$filepath = $this->configDir . $filename . ".config.php"; $filepath = $this->configDir . $filename . ".config.php";
}
if (!file_exists($filepath)) { if (!file_exists($filepath)) {
throw new \Exception('Error loading non-existent config file ' . $filepath); throw new \Exception('Error loading non-existent config file ' . $filepath);