This merge brings back dbm::is_result() where I could find it.

[friendica.git] / include / api.php

diff --git a/include/api.php b/include/api.php
index a9c5e7a46820736fb22faf6adcca65efbccbc506..d6f6dec7d9b387fc86fd8cbc0c7aebd575b74dc8 100644 (file)
--- a/include/api.php
+++ b/include/api.php
@@ -208,7 +208,7 @@
                                dbesc(trim($user)),
                                dbesc($encrypted)
                        );
-                       if(count($r))
+                       if(dbm::is_result($r))
                                $record = $r[0];
                }
 
@@ -1336,10 +1336,10 @@
 
                if (isset($_GET["q"])) {
                        $r = q("SELECT id FROM `gcontact` WHERE `name`='%s'", dbesc($_GET["q"]));
-                       if (!count($r))
+                       if (!dbm::is_result($r))
                                $r = q("SELECT `id` FROM `gcontact` WHERE `nick`='%s'", dbesc($_GET["q"]));
 
-                       if (count($r)) {
+                       if (dbm::is_result($r)) {
                                $k = 0;
                                foreach ($r AS $user) {
                                        $user_info = api_get_user($a, $user["id"], "json");
@@ -2747,8 +2747,7 @@
                        intval(api_user())
                );
 
-               if(!dbm::is_result($r))
-                       return;
+               if(dbm::is_result($r)) {
 
                $ids = array();
                foreach($r as $rr)