diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-04 19:20:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-04 19:20:29 -0700 |
| commit | e308c3d34afda1c467b049314324faa546294c9a (patch) | |
| tree | 81352041e9dd94700e8be158ddda7ee66fea68f4 /Zotlabs | |
| parent | 977677d0051db24c6b7666a73c4dd6a48fe89377 (diff) | |
| parent | 5c7acf4807aa427cf1391e0a5d044b453c38e619 (diff) | |
| download | volse-hubzilla-e308c3d34afda1c467b049314324faa546294c9a.tar.gz volse-hubzilla-e308c3d34afda1c467b049314324faa546294c9a.tar.bz2 volse-hubzilla-e308c3d34afda1c467b049314324faa546294c9a.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Module/Import.php | 3 |
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'])) |