aboutsummaryrefslogtreecommitdiffstats
path: root/mod/import.php
diff options
context:
space:
mode:
authorWave <tuscanhobbit@users.noreply.github.com>2015-10-19 10:28:17 +0200
committerWave <tuscanhobbit@users.noreply.github.com>2015-10-19 10:28:17 +0200
commit3e9b6a330d157ac8aa4831b57d33ec495345a9c7 (patch)
tree8c2539297a17b3f1409536b94dd4558c5a32bd08 /mod/import.php
parent319b02a757ced679d0eaf141cc40db585fa6f84b (diff)
parentb54c4df74dd370c74d5822cdd00e0cf1ff52493f (diff)
downloadvolse-hubzilla-3e9b6a330d157ac8aa4831b57d33ec495345a9c7.tar.gz
volse-hubzilla-3e9b6a330d157ac8aa4831b57d33ec495345a9c7.tar.bz2
volse-hubzilla-3e9b6a330d157ac8aa4831b57d33ec495345a9c7.zip
Merge pull request #1 from redmatrix/master
Update to latest hubzilla
Diffstat (limited to 'mod/import.php')
-rw-r--r--mod/import.php6
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']);