Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-04-24 23:50:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

Prevent infinite loops with Config when App is in install mode

Browse source
This commit is contained in:
Hypolite Petovan 2018-06-25 20:57:57 -04:00
parent 46b34574d9
commit fd7179ee6c
3 changed files with 55 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/Core/PConfig.php
View file

@ -9,7 +9,6 @@
namespace Friendica\Core;
use Friendica\BaseObject;
use Friendica\Core\Config;
require_once 'include/dba.php';
@ -29,7 +28,12 @@ class PConfig extends BaseObject
public static function init($uid)
{
if (Config::get('system', 'config_adapter') == 'preload') {
// Database isn't ready or populated yet
if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
return;
}
if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
self::$adapter = new Config\PreloadPConfigAdapter($uid);
} else {
self::$adapter = new Config\JITPConfigAdapter($uid);
@ -49,6 +53,11 @@ class PConfig extends BaseObject
*/
public static function load($uid, $family)
{
// Database isn't ready or populated yet
if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
return;
}
if (empty(self::$adapter)) {
self::init($uid);
}
@ -73,6 +82,11 @@ class PConfig extends BaseObject
*/
public static function get($uid, $family, $key, $default_value = null, $refresh = false)
{
// Database isn't ready or populated yet
if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
return;
}
if (empty(self::$adapter)) {
self::init($uid);
}
@ -97,6 +111,11 @@ class PConfig extends BaseObject
*/
public static function set($uid, $family, $key, $value)
{
// Database isn't ready or populated yet
if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
return false;
}
if (empty(self::$adapter)) {
self::init($uid);
}
@ -118,6 +137,11 @@ class PConfig extends BaseObject
*/
public static function delete($uid, $family, $key)
{
// Database isn't ready or populated yet
if (self::getApp()->mode === \Friendica\App::MODE_INSTALL) {
return false;
}
if (empty(self::$adapter)) {
self::init($uid);
}