This commit is contained in:
Philipp Holzer 2019-02-23 00:53:31 +01:00
parent b23368b0ea
commit 40e9bbeb88
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
2 changed files with 3 additions and 3 deletions

View file

@ -221,7 +221,7 @@ class App
$this->config = $config; $this->config = $config;
$this->profiler = $profiler; $this->profiler = $profiler;
$cfgBasePath = $this->config->get('system', 'basepath'); $cfgBasePath = $this->config->get('system', 'basepath');
$this->basePath = (isset($cfgBasePath) && $cfgBasePath !== '') ? $cfgBasePath : $basePath; $this->basePath = !empty($cfgBasePath) ? $cfgBasePath : $basePath;
if (!Core\System::isDirectoryUsable($this->basePath, false)) { if (!Core\System::isDirectoryUsable($this->basePath, false)) {
throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.'); throw new Exception('Basepath \'' . $this->basePath . '\' isn\'t usable.');

View file

@ -48,8 +48,6 @@ class Config
* @brief Get a particular user's config variable given the category name * @brief Get a particular user's config variable given the category name
* ($family) and a key. * ($family) and a key.
* *
* Note: Please do not store booleans - convert to 0/1 integer values!
*
* @param string $cat The category of the configuration value * @param string $cat The category of the configuration value
* @param string $key The configuration key to query * @param string $key The configuration key to query
* @param mixed $default_value optional, The value to return if key is not set (default: null) * @param mixed $default_value optional, The value to return if key is not set (default: null)
@ -67,6 +65,8 @@ class Config
* *
* Stores a config value ($value) in the category ($cat) under the key ($key) * Stores a config value ($value) in the category ($cat) under the key ($key)
* *
* Note: Please do not store booleans - convert to 0/1 integer values!
*
* @param string $cat The category of the configuration value * @param string $cat The category of the configuration value
* @param string $key The configuration key to set * @param string $key The configuration key to set
* @param mixed $value The value to store * @param mixed $value The value to store