diff options
| author | Mario Vavti <mario@mariovavti.com> | 2016-06-22 09:58:55 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2016-06-22 09:58:55 +0200 |
| commit | 5536df51f58a65f5a42051b0466b1c13c9a9718a (patch) | |
| tree | e2000aa48946689e1c9e2b9d7b172854d69e2cbd /Zotlabs/Module/Import.php | |
| parent | ecae0b3d97d759603bb2bf9bc51187a2842964c8 (diff) | |
| parent | f48b12ff52c4fda85c09c1cc476f7cf4c0cfb649 (diff) | |
| download | volse-hubzilla-5536df51f58a65f5a42051b0466b1c13c9a9718a.tar.gz volse-hubzilla-5536df51f58a65f5a42051b0466b1c13c9a9718a.tar.bz2 volse-hubzilla-5536df51f58a65f5a42051b0466b1c13c9a9718a.zip | |
erge branch 'dev' into sabre32
Diffstat (limited to 'Zotlabs/Module/Import.php')
| -rw-r--r-- | Zotlabs/Module/Import.php | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 122e27e90..4a559fe95 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -131,6 +131,8 @@ class Import extends \Zotlabs\Web\Controller { // import channel + $relocate = ((array_key_exists('relocate',$data)) ? $data['relocate'] : null); + if(array_key_exists('channel',$data)) { if($completed < 1) { @@ -475,7 +477,7 @@ class Import extends \Zotlabs\Web\Controller { import_events($channel,$data['event']); if(is_array($data['event_item'])) - import_items($channel,$data['event_item']); + import_items($channel,$data['event_item'],false,$relocate); if(is_array($data['menu'])) import_menus($channel,$data['menu']); @@ -486,7 +488,7 @@ class Import extends \Zotlabs\Web\Controller { $saved_notification_flags = notifications_off($channel['channel_id']); if($import_posts && array_key_exists('item',$data) && $data['item']) - import_items($channel,$data['item']); + import_items($channel,$data['item'],false,$relocate); notifications_on($channel['channel_id'],$saved_notification_flags); |