friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Bugfixing Addon-config

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

16
src/Core/Config/ConfigCacheLoader.php
View File

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