Merge pull request #5776 from annando/fix-contact

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

diff --git a/src/Core/Config/JITConfigAdapter.php b/src/Core/Config/JITConfigAdapter.php
index 77902ffc82dfab07d8d2b3e96c8ba838eabb04b6..b985d91c2122ade49efee07753ecfccaa9c1911a 100644 (file)
--- a/src/Core/Config/JITConfigAdapter.php
+++ b/src/Core/Config/JITConfigAdapter.php
@@ -2,8 +2,7 @@
 namespace Friendica\Core\Config;
 
 use Friendica\BaseObject;
-use Friendica\Database\dba;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -12,7 +11,7 @@ require_once 'include/dba.php';
  *
  * Default Config Adapter. Provides the best performance for pages loading few configuration variables.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class JITConfigAdapter extends BaseObject implements IConfigAdapter
 {
@@ -27,8 +26,8 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
                        return;
                }
 
-               $configs = dba::select('config', ['v', 'k'], ['cat' => $cat]);
-               while ($config = dba::fetch($configs)) {
+               $configs = DBA::select('config', ['v', 'k'], ['cat' => $cat]);
+               while ($config = DBA::fetch($configs)) {
                        $k = $config['k'];
 
                        self::getApp()->setConfigValue($cat, $k, $config['v']);
@@ -38,7 +37,7 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
                                $this->in_db[$cat][$k] = true;
                        }
                }
-               dba::close($configs);
+               DBA::close($configs);
        }
 
        public function get($cat, $k, $default_value = null, $refresh = false)
@@ -56,8 +55,8 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
                        }
                }
 
-               $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)) {
                        // manage array value
                        $value = (preg_match("|^a:[0-9]+:{.*}$|s", $config['v']) ? unserialize($config['v']) : $config['v']);
 
@@ -115,7 +114,7 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
                // manage array value
                $dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-               $result = dba::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
+               $result = DBA::update('config', ['v' => $dbvalue], ['cat' => $cat, 'k' => $k], true);
 
                if ($result) {
                        $this->in_db[$cat][$k] = true;
@@ -131,7 +130,7 @@ class JITConfigAdapter extends BaseObject implements IConfigAdapter
                        unset($this->in_db[$cat][$k]);
                }
 
-               $result = dba::delete('config', ['cat' => $cat, 'k' => $k]);
+               $result = DBA::delete('config', ['cat' => $cat, 'k' => $k]);
 
                return $result;
        }