diff options
| author | Mario <mario@mariovavti.com> | 2024-06-28 18:19:34 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2024-06-28 18:19:34 +0000 |
| commit | 3f5c45a567c3dc61b755b75584b16fc98e223bea (patch) | |
| tree | b7dda94ad06b29b5a90e1b8ca1fb905619f36cdc | |
| parent | b51ed67efb7d7f87633295e4684b83a2c895847c (diff) | |
| parent | 464149e22d2654fc548e4c7090358d9007bc8031 (diff) | |
| download | volse-hubzilla-3f5c45a567c3dc61b755b75584b16fc98e223bea.tar.gz volse-hubzilla-3f5c45a567c3dc61b755b75584b16fc98e223bea.tar.bz2 volse-hubzilla-3f5c45a567c3dc61b755b75584b16fc98e223bea.zip | |
Merge branch 'dev' into 9.2RC
| -rw-r--r-- | Zotlabs/Module/Import.php | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Zotlabs/Module/Import.php b/Zotlabs/Module/Import.php index 24b7498dd..5ace4e72d 100644 --- a/Zotlabs/Module/Import.php +++ b/Zotlabs/Module/Import.php @@ -192,6 +192,12 @@ class Import extends Controller { return; } + if ($channel['channel_removed']) { + logger('Channel exists but has been marked removed on this hub. ', print_r($channel,true)); + notice( t('Channel exists but has been marked removed on this hub. Import failed.') . EOL); + return; + } + if (is_array($data['config'])) { import_config($channel, $data['config']); } @@ -558,7 +564,7 @@ class Import extends Controller { goaway(z_root() . '/import_progress'); } - if (!$cf_api_compat) { + if ($import_posts && !$cf_api_compat) { notice(t('Automatic content and files import was not possible due to API version incompatiblity. Please import content and files manually!') . EOL); } |