strk/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'rewrites/dbm_is_result' into develop

Browse source
This commit is contained in:
Roland Häder 2016-12-19 14:47:05 +01:00
commit dac1dbd3e9
11 changed files with 20 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/socgraph.php
View file

@ -1558,7 +1558,7 @@ function get_gcontact_id($contact) {
proc_run(PRIORITY_LOW, 'include/gprobe.php', bin2hex($contact["url"]));
}
if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
if ((dbm::is_result($r)) AND (count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d",
dbesc(normalise_link($contact["url"])),
intval($gcontact_id));