X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FPConfig.php;h=2b6618930097c1c2ddf6c149b2a8d9286372331d;hb=9fbaaa1481a609563e00a40db64bdce5e02c5524;hp=bfa52f5a36ebd7e480d97d2c638ccf8a77b2958e;hpb=9665f4ed415d34cbcf09df8c6ca04882303e9544;p=friendica.git

diff --git a/src/Core/PConfig.php b/src/Core/PConfig.php
index bfa52f5a36..2b66189300 100644
--- 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,9 +29,12 @@ class PConfig extends BaseObject
 
 	public static function init($uid)
 	{
-		$a = self::getApp();
+		// Database isn't ready or populated yet
+		if (!(self::getApp()->mode & App::MODE_DBCONFIGAVAILABLE)) {
+			return;
+		}
 
-		if (isset($a->config['system']['config_adapter']) && $a->config['system']['config_adapter'] == 'preload') {
+		if (self::getApp()->getConfigValue('system', 'config_adapter') == 'preload') {
 			self::$adapter = new Config\PreloadPConfigAdapter($uid);
 		} else {
 			self::$adapter = new Config\JITPConfigAdapter($uid);
@@ -51,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);
 		}
@@ -75,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);
 		}
@@ -95,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);
 		}
@@ -120,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);
 		}