Merge pull request #5815 from annando/ap2

[friendica.git] / src / Core / PConfig.php

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index 274122deda4513dd63acaeded4414989b0d7fd21..2b6618930097c1c2ddf6c149b2a8d9286372331d 100644 (file)
--- a/src/Core/PConfig.php
+++ b/src/Core/PConfig.php
@@ -8,8 +8,8 @@
  */
 namespace Friendica\Core;
 
+use Friendica\App;
 use Friendica\BaseObject;
-use Friendica\Core\Config;
 
 require_once 'include/dba.php';
 
@@ -29,7 +29,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 & App::MODE_DBCONFIGAVAILABLE)) {
+                       return;
+               }
+
+               if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
                        self::$adapter = new Config\PreloadPConfigAdapter($uid);
                } else {
                        self::$adapter = new Config\JITPConfigAdapter($uid);
@@ -49,6 +54,11 @@ class PConfig extends BaseObject
         */
        public static function load($uid, $family)
        {
+               // Database isn't ready or populated yet
+               if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+                       return;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }
@@ -73,6 +83,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 & App::MODE_DBCONFIGAVAILABLE)) {
+                       return;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }
@@ -93,10 +108,15 @@ class PConfig extends BaseObject
         * @param string $key    The configuration key to set
         * @param string $value  The value to store
         *
-        * @return mixed Stored $value or false
+        * @return bool Operation success
         */
        public static function set($uid, $family, $key, $value)
        {
+               // Database isn't ready or populated yet
+               if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+                       return false;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }
@@ -118,6 +138,11 @@ class PConfig extends BaseObject
         */
        public static function delete($uid, $family, $key)
        {
+               // Database isn't ready or populated yet
+               if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+                       return false;
+               }
+
                if (empty(self::$adapter)) {
                        self::init($uid);
                }