diff options
| author | nobody <nobody@zotlabs.com> | 2021-05-31 14:36:14 -0700 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-05-31 14:36:14 -0700 |
| commit | 462980c70a2698490d97a481cee0f2500dacb91c (patch) | |
| tree | 4935db45ad6fbe37cd0af3b93bbb20ecb656c752 /Zotlabs/Module/Import.php | |
| parent | a96345401f47be71a6eef531e204c0e25b792a16 (diff) | |
| parent | 217168628421f4e394b9b85e33d2d653d8b5b3d6 (diff) | |
| download | volse-hubzilla-462980c70a2698490d97a481cee0f2500dacb91c.tar.gz volse-hubzilla-462980c70a2698490d97a481cee0f2500dacb91c.tar.bz2 volse-hubzilla-462980c70a2698490d97a481cee0f2500dacb91c.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Module/Import.php')
| -rw-r--r-- | Zotlabs/Module/Import.php | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 8ef24b232..4622a588d 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -209,12 +209,6 @@ class Import extends \Zotlabs\Web\Controller { logger('import step 3'); - if(is_array($data['hubloc'])) { - import_hublocs($channel,$data['hubloc'],$seize,$moving); - } - - logger('import step 4'); - // create new hubloc for the new channel at this site if(array_key_exists('channel',$data)) { @@ -277,7 +271,7 @@ class Import extends \Zotlabs\Web\Controller { } - logger('import step 5'); + logger('import step 4'); // import xchans and contact photos @@ -335,7 +329,7 @@ class Import extends \Zotlabs\Web\Controller { } - logger('import step 6'); + logger('import step 5'); // import xchans $xchans = $data['xchan']; @@ -404,7 +398,14 @@ class Import extends \Zotlabs\Web\Controller { } } - logger('import step 7'); + logger('import step 6'); + } + + logger('import step 7'); + + // this must happen after xchans got imported! + if(is_array($data['hubloc'])) { + import_hublocs($channel,$data['hubloc'],$seize,$moving); } $friends = 0; |