diff options
| author | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-03-01 22:09:06 +0100 |
|---|---|---|
| committer | jeroenpraat <jeroenpraat@xs4all.nl> | 2016-03-01 22:09:06 +0100 |
| commit | 8b61e546fe488516fa3c5f37df80a68e346b84a9 (patch) | |
| tree | 8af09fcff55cd613d5d2557a7c0956bd25a4afa3 /mod/import.php | |
| parent | 7206e8af3a943b0fb286f253ed3abbda2d2572b6 (diff) | |
| parent | 7808689198601780041e022bf0698e559869f305 (diff) | |
| download | volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.gz volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.tar.bz2 volse-hubzilla-8b61e546fe488516fa3c5f37df80a68e346b84a9.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/mod/import.php b/mod/import.php index 184159585..0b239d822 100644 --- a/mod/import.php +++ b/mod/import.php @@ -341,6 +341,10 @@ function import_account(&$a, $account_id) { if($abooks) { foreach($abooks as $abook) { + $abconfig = null; + if(array_key_exists('abconfig',$abook) && is_array($abook['abconfig']) && count($abook['abconfig'])) + $abconfig = $abook['abconfig']; + unset($abook['abook_id']); unset($abook['abook_rating']); unset($abook['abook_rating_text']); @@ -382,6 +386,17 @@ function import_account(&$a, $account_id) { $friends ++; if(intval($abook['abook_feed'])) $feeds ++; + + if($abconfig) { + // @fixme does not handle sync of del_abconfig + foreach($abconfig as $abc) { + if($abc['chan'] === $channel['channel_hash']) + set_abconfig($abc['chan'],$abc['xchan'],$abc['cat'],$abc['k'],$abc['v']); + } + } + + + } } logger('import step 8'); |