Merge pull request #5667 from miqrogroove/patch-1

[friendica.git] / src / Core / Config / PreloadConfigAdapter.php

diff --git a/src/Core/Config/PreloadConfigAdapter.php b/src/Core/Config/PreloadConfigAdapter.php
index 7a97854a43fc0dd1a75afc711e919e41d99acded..26df41cce98952746400446efa1bcb3bbf3bc347 100644 (file)
--- a/src/Core/Config/PreloadConfigAdapter.php
+++ b/src/Core/Config/PreloadConfigAdapter.php
@@ -4,8 +4,7 @@ namespace Friendica\Core\Config;
 
 use Exception;
 use Friendica\BaseObject;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -31,11 +30,11 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
                        return;
                }
 
-               $configs = dba::select('config', ['cat', 'v', 'k']);
-               while ($config = dba::fetch($configs)) {
+               $configs = DBA::select('config', ['cat', 'v', 'k']);
+               while ($config = DBA::fetch($configs)) {
                        self::getApp()->setConfigValue($config['cat'], $config['k'], $config['v']);
                }
-               dba::close($configs);
+               DBA::close($configs);
 
                $this->config_loaded = true;
        }
@@ -43,8 +42,8 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
        public function get($cat, $k, $default_value = null, $refresh = false)
        {
                if ($refresh) {
-                       $config = dba::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
-                       if (DBM::is_result($config)) {
+                       $config = DBA::selectFirst('config', ['v'], ['cat' => $cat, 'k' => $k]);
+                       if (DBA::isResult($config)) {
                                self::getApp()->setConfigValue($cat, $k, $config['v']);
                        }
                }
@@ -70,7 +69,7 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
                // manage array value
                $dbvalue = is_array($value) ? serialize($value) : $value;
 
-               $result = dba::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
+               $result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
                if (!$result) {
                        throw new Exception('Unable to store config value in [' . $cat . '][' . $k . ']');
                }
@@ -82,7 +81,7 @@ class PreloadConfigAdapter extends BaseObject implements IConfigAdapter
        {
                self::getApp()->deleteConfigValue($cat, $k);
 
-               $result = dba::delete('config', ['cat' => $cat, 'k' => $k]);
+               $result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
 
                return $result;
        }