]> git.mxchange.org Git - friendica.git/commitdiff
Don't cherry-pick: reverted unrelated changes (dbm::is_result())
authorRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 15:21:59 +0000 (16:21 +0100)
committerRoland Häder <roland@mxchange.org>
Tue, 20 Dec 2016 15:21:59 +0000 (16:21 +0100)
Signed-off-by: Roland Häder <roland@mxchange.org>
include/Core/Config.php
include/Core/PConfig.php

index 523572886457edb82971cd645ceb6ee42e03cb28..7b7045a9ee3ed2f3fe00989d97db6cba13e9959f 100644 (file)
@@ -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;
index 49b69a1f7a2d814de21e87e9e6ba2ca2bd4fa430..43735018e4ce143b2826ed61d61987d21cd9303e 100644 (file)
@@ -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;