friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-06-09 01:00:16 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

bugfix marking of db-values

Browse source
This commit is contained in:
Philipp Holzer 2019-02-22 23:57:04 +01:00
parent b47fc97b06
commit 8d56fb8fbe
No known key found for this signature in database
GPG key ID: 517BE60E2CE5C8A5
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/Core/Config/Adapter/JITPConfigAdapter.php
View file

@ -49,15 +49,19 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
/** /**
* {@inheritdoc} * {@inheritdoc}
*
* @param bool $mark if true, mark the selection of the current cat/key pair
*/ */
public function get($uid, $cat, $key) public function get($uid, $cat, $key, $mark = true)
{ {
if (!$this->isConnected()) { if (!$this->isConnected()) {
return null; return null;
} }
// The value was in the db, so don't check it again (unless you have to) // The value was in the db, so don't check it again (unless you have to)
$this->in_db[$uid][$cat][$key] = true; if ($mark) {
$this->in_db[$uid][$cat][$key] = true;
}
$pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]); $pconfig = DBA::selectFirst('pconfig', ['v'], ['uid' => $uid, 'cat' => $cat, 'k' => $key]);
if (DBA::isResult($pconfig)) { if (DBA::isResult($pconfig)) {
@ -86,7 +90,7 @@ class JITPConfigAdapter extends AbstractDbaConfigAdapter implements IPConfigAdap
// The exception are array values. // The exception are array values.
$dbvalue = (!is_array($value) ? (string)$value : $value); $dbvalue = (!is_array($value) ? (string)$value : $value);
$stored = $this->get($uid, $cat, $key); $stored = $this->get($uid, $cat, $key, false);
if (!isset($this->in_db[$uid])) { if (!isset($this->in_db[$uid])) {
$this->in_db[$uid] = []; $this->in_db[$uid] = [];