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

Bugfixing PConfig

Browse source
This commit is contained in:
Philipp Holzer 2019-02-03 23:22:05 +01:00
parent 8b70ae6d46
commit f3da5b3a2f
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
4 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/App.php
View file

@ -375,7 +375,7 @@ class App
$adapterType = $this->config->get('system', 'config_adapter'); $adapterType = $this->config->get('system', 'config_adapter');
$adapter = ConfigFactory::createConfig($adapterType, $this->config); $adapter = ConfigFactory::createConfig($adapterType, $this->config);
Core\Config::setAdapter($adapter); Core\Config::setAdapter($adapter);
$adapterP = ConfigFactory::createConfig($adapterType, $this->config); $adapterP = ConfigFactory::createPConfig($adapterType, $this->config);
Core\PConfig::setAdapter($adapterP); Core\PConfig::setAdapter($adapterP);
Core\Config::load(); Core\Config::load();
} }

2
src/Core/Config/ConfigCache.php
View file

@ -121,7 +121,7 @@ class ConfigCache implements IConfigCache, IPConfigCache
if (isset($this->config[$uid][$cat][$key])) { if (isset($this->config[$uid][$cat][$key])) {
$return = $this->config[$uid][$cat][$key]; $return = $this->config[$uid][$cat][$key];
} elseif ($key == null && isset($this->config[$uid][$cat])) { } elseif ($key === null && isset($this->config[$uid][$cat])) {
$return = $this->config[$uid][$cat]; $return = $this->config[$uid][$cat];
} }

6
src/Core/Config/PreloadPConfigAdapter.php
View file

@ -23,14 +23,16 @@ class PreloadPConfigAdapter implements IPConfigAdapter
private $config; private $config;
/** /**
* @param int $uid The UID of the current user
* @param IPConfigCache $config The config cache of this adapter * @param IPConfigCache $config The config cache of this adapter
* @param int $uid The UID of the current user
*/ */
public function __construct($uid, $config) public function __construct($config, $uid = null)
{ {
$this->config = $config; $this->config = $config;
if (isset($uid)) {
$this->load($uid, 'config'); $this->load($uid, 'config');
} }
}
public function load($uid, $family) public function load($uid, $family)
{ {

6
src/Factory/ConfigFactory.php
View file

@ -36,15 +36,15 @@ class ConfigFactory
/** /**
* @param string $type The adapter type * @param string $type The adapter type
* @param int $uid The UID of the current user
* @param Config\IPConfigCache $config The config cache of this adapter * @param Config\IPConfigCache $config The config cache of this adapter
* @param int $uid The UID of the current user
* *
* @return Config\IPConfigAdapter * @return Config\IPConfigAdapter
*/ */
public static function createPConfig($type, $uid, $config) public static function createPConfig($type, $config, $uid = null)
{ {
if ($type == 'preload') { if ($type == 'preload') {
return new Config\PreloadPConfigAdapter($uid, $config); return new Config\PreloadPConfigAdapter($config, $uid);
} else { } else {
return new Config\JITPConfigAdapter($config); return new Config\JITPConfigAdapter($config);
} }