mirror of
https://github.com/friendica/friendica
synced 2024-10-08 16:01:55 +02:00
Don't cherry-pick: reverted unrelated changes (dbm::is_result())
Signed-off-by: Roland Häder <roland@mxchange.org>
This commit is contained in:
parent
d72673b162
commit
361a55155c
|
@ -97,7 +97,7 @@ class Config {
|
|||
dbesc($family),
|
||||
dbesc($key)
|
||||
);
|
||||
if (dbm::is_result($ret)) {
|
||||
if (count($ret)) {
|
||||
// manage array value
|
||||
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
|
||||
$a->config[$family][$key] = $val;
|
||||
|
|
|
@ -92,7 +92,7 @@ class PConfig {
|
|||
dbesc($key)
|
||||
);
|
||||
|
||||
if (dbm::is_result($ret)) {
|
||||
if (count($ret)) {
|
||||
$val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']);
|
||||
$a->config[$uid][$family][$key] = $val;
|
||||
|
||||
|
|
Loading…
Reference in a new issue