X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FCore%2FConfig%2FJITPConfigAdapter.php;h=512004b50835199f0cd15ad4164046ef47239a7f;hb=5e60fa8210b502797209de770780d6d7ba81b86c;hp=ce9c5b6462d95d58a346620a6474f1eba5568408;hpb=da40c96e9a059e1f41ff62bdf7107c9dbfca6dbe;p=friendica.git

diff --git a/src/Core/Config/JITPConfigAdapter.php b/src/Core/Config/JITPConfigAdapter.php
index ce9c5b6462..512004b508 100644
--- a/src/Core/Config/JITPConfigAdapter.php
+++ b/src/Core/Config/JITPConfigAdapter.php
@@ -1,9 +1,8 @@
 <?php
 namespace Friendica\Core\Config;
 
-use dba;
 use Friendica\BaseObject;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
 
 require_once 'include/dba.php';
 
@@ -12,7 +11,7 @@ require_once 'include/dba.php';
  *
  * Default PConfig Adapter. Provides the best performance for pages loading few configuration variables.
  *
- * @author Hypolite Petovan <mrpetovan@gmail.com>
+ * @author Hypolite Petovan <hypolite@mrpetovan.com>
  */
 class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 {
@@ -22,9 +21,9 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 	{
 		$a = self::getApp();
 
-		$pconfigs = dba::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
-		if (DBM::is_result($pconfigs)) {
-			while ($pconfig = dba::fetch($pconfigs)) {
+		$pconfigs = DBA::select('pconfig', ['v', 'k'], ['cat' => $cat, 'uid' => $uid]);
+		if (DBA::isResult($pconfigs)) {
+			while ($pconfig = DBA::fetch($pconfigs)) {
 				$k = $pconfig['k'];
 
 				self::getApp()->setPConfigValue($uid, $cat, $k, $pconfig['v']);
@@ -35,7 +34,7 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 			// Negative caching
 			$a->config[$uid][$cat] = "!<unset>!";
 		}
-		dba::close($pconfigs);
+		DBA::close($pconfigs);
 	}
 
 	public function get($uid, $cat, $k, $default_value = null, $refresh = false)
@@ -58,8 +57,8 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 			}
 		}
 
-		$pconfig = dba::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
-		if (DBM::is_result($pconfig)) {
+		$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+		if (DBA::isResult($pconfig)) {
 			$val = (preg_match("|^a:[0-9]+:{.*}$|s", $pconfig['v']) ? unserialize($pconfig['v']) : $pconfig['v']);
 
 			self::getApp()->setPConfigValue($uid, $cat, $k, $val);
@@ -94,11 +93,10 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 		// manage array value
 		$dbvalue = (is_array($value) ? serialize($value) : $dbvalue);
 
-		$result = dba::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
+		$result = DBA::update('pconfig', ['v' => $dbvalue], ['uid' => $uid, 'cat' => $cat, 'k' => $k], true);
 
 		if ($result) {
 			$this->in_db[$uid][$cat][$k] = true;
-			return $value;
 		}
 
 		return $result;
@@ -112,7 +110,7 @@ class JITPConfigAdapter extends BaseObject implements IPConfigAdapter
 			unset($this->in_db[$uid][$cat][$k]);
 		}
 
-		$result = dba::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
+		$result = DBA::delete('pconfig', ['uid' => $uid, 'cat' => $cat, 'k' => $k]);
 
 		return $result;
 	}