From: Roland Häder Date: Tue, 20 Dec 2016 15:21:59 +0000 (+0100) Subject: Don't cherry-pick: reverted unrelated changes (dbm::is_result()) X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=361a55155c5b439c5a527647bd22356560c867a2;p=friendica.git Don't cherry-pick: reverted unrelated changes (dbm::is_result()) Signed-off-by: Roland Häder --- diff --git a/include/Core/Config.php b/include/Core/Config.php index 5235728864..7b7045a9ee 100644 --- a/include/Core/Config.php +++ b/include/Core/Config.php @@ -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; diff --git a/include/Core/PConfig.php b/include/Core/PConfig.php index 49b69a1f7a..43735018e4 100644 --- a/include/Core/PConfig.php +++ b/include/Core/PConfig.php @@ -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;