aboutsummaryrefslogtreecommitdiffstats
path: root/mod
diff options
context:
space:
mode:
Diffstat (limited to 'mod')
-rw-r--r--mod/import.php9
1 files changed, 8 insertions, 1 deletions
diff --git a/mod/import.php b/mod/import.php
index 088c5cb61..4542ef7a0 100644
--- a/mod/import.php
+++ b/mod/import.php
@@ -84,6 +84,13 @@ function import_post(&$a) {
$data = json_decode($data,true);
+ if(array_key_exists('user',$data) && array_key_exists('aspects',$data)) {
+ require_once('include/Import/import_diaspora.php');
+ import_diaspora($data);
+ return;
+ }
+
+
// logger('import: data: ' . print_r($data,true));
// print_r($data);
@@ -308,7 +315,7 @@ function import_post(&$a) {
dbesc($photos[2]),
dbesc($photos[3]),
dbesc($photodate),
- dbesc($xchan_hash)
+ dbesc($xchan['xchan_hash'])
);
}