diff options
| author | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2015-10-15 09:36:51 +0200 |
| commit | 2848f5dab4e0f904280e77d6403ab69926cabe1d (patch) | |
| tree | bcb2f2a70660d7abe319b126035d2e0b2ddd2c41 /mod/import.php | |
| parent | 3c7d2d4cea80fae5113de8c78ed522ce8b32c16d (diff) | |
| parent | f0f5a8f2b510b92aa1fde2cbaf118a784c154432 (diff) | |
| download | volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.gz volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.tar.bz2 volse-hubzilla-2848f5dab4e0f904280e77d6403ab69926cabe1d.zip | |
Merge branch 'master' of https://github.com/redmatrix/hubzilla
Diffstat (limited to 'mod/import.php')
| -rw-r--r-- | mod/import.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mod/import.php b/mod/import.php index b6e36d734..72d8f92e9 100644 --- a/mod/import.php +++ b/mod/import.php @@ -441,6 +441,12 @@ function import_post(&$a) { if(is_array($data['chatroom'])) import_chatrooms($channel,$data['chatroom']); + if(is_array($data['conv'])) + import_conv($channel,$data['conv']); + + if(is_array($data['mail'])) + import_mail($channel,$data['mail']); + if(is_array($data['event'])) import_events($channel,$data['event']); |