aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-05 16:58:46 -0700
committerzotlabs <mike@macgirvin.com>2017-05-05 16:58:46 -0700
commitf840082aaead8356a5787109f0c67179ecdf7993 (patch)
tree05fcb73fae9412706a04a44a3188a187375d3ca4 /Zotlabs
parent47ebddf99f5487cbcdfbabaa367c7b09fa0a86e3 (diff)
parent3ccefa20e8b10d0a507c6b002237664e721ca389 (diff)
downloadvolse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.gz
volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.tar.bz2
volse-hubzilla-f840082aaead8356a5787109f0c67179ecdf7993.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Module/Import.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php
index 54bc7de81..ce3fd469a 100644
--- a/Zotlabs/Module/Import.php
+++ b/Zotlabs/Module/Import.php
@@ -318,6 +318,7 @@ class Import extends \Zotlabs\Web\Controller {
unset($abook['abconfig']);
unset($abook['abook_their_perms']);
unset($abook['abook_my_perms']);
+ unset($abook['abook_not_here']);
$abook['abook_account'] = $account_id;
$abook['abook_channel'] = $channel['channel_id'];
@@ -347,7 +348,7 @@ class Import extends \Zotlabs\Web\Controller {
continue;
}
- create_table_from_array('abook',$abook);
+ abook_store_lowlevel($abook);
$friends ++;
if(intval($abook['abook_feed']))