harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

hubzilla issue #1149, don't duplicate addressbook entries on repeated channel imports

Browse Source
This commit is contained in:
zotlabs
2018-05-01 16:15:59 -07:00
committed by Mario Vavti
parent 5c5ae2969e
commit b28279241b
1 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Zotlabs/Module/Import.php
View File

@@ -363,11 +363,27 @@ class Import extends \Zotlabs\Web\Controller {
continue; continue;
} }
abook_store_lowlevel($abook); $r = q("select abook_id from abook where abook_xchan = '%s' and abook_channel = %d limit 1",
dbesc($abook['abook_xchan']),
intval($channel['channel_id'])
);
if($r) {
foreach($abook as $k => $v) {
$r = q("UPDATE abook SET " . TQUOT . "%s" . TQUOT . " = '%s' WHERE abook_xchan = '%s' AND abook_channel = %d",
dbesc($k),
dbesc($v),
dbesc($abook['abook_xchan']),
intval($channel['channel_id'])
);
}
}
else {
abook_store_lowlevel($abook);
$friends ++; $friends ++;
if(intval($abook['abook_feed'])) if(intval($abook['abook_feed']))
$feeds ++; $feeds ++;
}
translate_abook_perms_inbound($channel,$abook_copy); translate_abook_perms_inbound($channel,$abook_copy);