diff options
| author | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-25 13:59:53 +0300 |
|---|---|---|
| committer | Zvi ben Yaakov (a.k.a rdc) <coderzvi@infosoc.net> | 2012-06-25 13:59:53 +0300 |
| commit | 94f895e98df73efe32a7c986a4b7844b0ab8fc01 (patch) | |
| tree | 92324c19bb13025d8f2f0087212348a039acbec6 /include/items.php | |
| parent | 00668aaa71336f48b141c443749a66c58a555503 (diff) | |
| parent | 7ea5917bf794c431fe304fa25380f19a6927cf63 (diff) | |
| download | volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.tar.gz volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.tar.bz2 volse-hubzilla-94f895e98df73efe32a7c986a4b7844b0ab8fc01.zip | |
Merge git://github.com/friendica/friendica
Diffstat (limited to 'include/items.php')
| -rwxr-xr-x | include/items.php | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/include/items.php b/include/items.php index 91ed6762c..e495393fa 100755 --- a/include/items.php +++ b/include/items.php @@ -1726,10 +1726,12 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0) $datarray['type'] = 'activity'; $datarray['gravity'] = GRAVITY_LIKE; // only one like or dislike per person - $r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1", + $r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 and (`parent-uri` = '%s' OR `thr_parent` = '%s') limit 1", intval($datarray['uid']), intval($datarray['contact-id']), - dbesc($datarray['verb']) + dbesc($datarray['verb']), + dbesc($parent_uri), + dbesc($parent_uri) ); if($r && count($r)) continue; @@ -2363,7 +2365,7 @@ function local_delivery($importer,$data) { $datarray['gravity'] = GRAVITY_LIKE; $datarray['last-child'] = 0; // only one like or dislike per person - $r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and (`thr-parent` = '%s' or `parent-uri` = '%s') and deleted = 0 limit 1", + $r = q("select id from item where uid = %d and `contact-id` = %d and verb = '%s' and (`thr-parent` = '%s' or `parent-uri` = '%s') and deleted = 0 limit 1", intval($datarray['uid']), intval($datarray['contact-id']), dbesc($datarray['verb']), @@ -2537,10 +2539,12 @@ function local_delivery($importer,$data) { $datarray['type'] = 'activity'; $datarray['gravity'] = GRAVITY_LIKE; // only one like or dislike per person - $r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 limit 1", + $r = q("select id from item where uid = %d and `contact-id` = %d and verb ='%s' and deleted = 0 and (`parent-uri` = '%s' OR `thr-parent` = '%s') limit 1", intval($datarray['uid']), intval($datarray['contact-id']), - dbesc($datarray['verb']) + dbesc($datarray['verb']), + dbesc($parent_uri), + dbesc($parent_uri) ); if($r && count($r)) continue; |