Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-19 10:30:10 +00:00
Code Issues Projects Releases Packages Wiki Activity

renamed Logger::setLogger() to Logger::init()

Browse source
This commit is contained in:
Philipp Holzer 2019-02-11 21:36:26 +01:00
parent 80f1feabe5
commit e1d9d67632
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
12 changed files with 276 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/Core/Config/Configuration.php
View file

@ -79,22 +79,20 @@ class Configuration
*/
public function get($cat, $key, $default_value = null, $refresh = false)
{
// Return the value of the cache if found and no refresh is forced
if (!$refresh && $this->configCache->has($cat, $key)) {
// if the value isn't loaded or refresh is needed, load it to the cache
if ($this->configAdapter->isConnected() &&
(!$this->configAdapter->isLoaded($cat, $key) ||
$refresh)) {
$dbvalue = $this->configAdapter->get($cat, $key);
if ($dbvalue !== '!<unset>!') {
$this->configCache->set($cat, $key, $dbvalue);
}
}
// use the config cache for return
if ($this->configCache->has($cat, $key)) {
return $this->configCache->get($cat, $key);
}
// if we don't find the value in the cache and the adapter isn't ready, return the default value
if (!$this->configAdapter->isConnected()) {
return $default_value;
}
// load DB value to cache
$dbvalue = $this->configAdapter->get($cat, $key);
if ($dbvalue !== '!<unset>!') {
$this->configCache->set($cat, $key, $dbvalue);
return $dbvalue;
} else {
return $default_value;
}