diff options
| author | Mario Vavti <mario@mariovavti.com> | 2021-10-01 21:52:30 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2021-10-01 21:52:30 +0200 |
| commit | 47e83a15c1168cfd8ebc7905db853f3db6b3b31b (patch) | |
| tree | 2cd700af6107995b2a35058ea7256bc30bf4266d /Zotlabs/Daemon | |
| parent | 597e847a3b245140042f18fa34c0b25ef8445256 (diff) | |
| download | volse-hubzilla-47e83a15c1168cfd8ebc7905db853f3db6b3b31b.tar.gz volse-hubzilla-47e83a15c1168cfd8ebc7905db853f3db6b3b31b.tar.bz2 volse-hubzilla-47e83a15c1168cfd8ebc7905db853f3db6b3b31b.zip | |
import_progress: deal with the situation where items/files are being imported but there are none to import
Diffstat (limited to 'Zotlabs/Daemon')
| -rw-r--r-- | Zotlabs/Daemon/Content_importer.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Daemon/File_importer.php | 1 |
2 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Daemon/Content_importer.php b/Zotlabs/Daemon/Content_importer.php index 4a07b4cf4..67f1c8e80 100644 --- a/Zotlabs/Daemon/Content_importer.php +++ b/Zotlabs/Daemon/Content_importer.php @@ -48,11 +48,9 @@ class Content_importer { } $j = json_decode($x['body'],true); - if (! $j) { - return; - } if(! is_array($j['item']) || ! count($j['item'])) { + PConfig::Set($channel['channel_id'], 'import', 'content_completed', 1); return; } diff --git a/Zotlabs/Daemon/File_importer.php b/Zotlabs/Daemon/File_importer.php index 28fb172a7..7067e152d 100644 --- a/Zotlabs/Daemon/File_importer.php +++ b/Zotlabs/Daemon/File_importer.php @@ -49,6 +49,7 @@ class File_importer { $j = json_decode($x['body'],true); if(! is_array($j['results'][0]['attach']) || ! count($j['results'][0]['attach'])) { + PConfig::Set($channel['channel_id'], 'import', 'files_completed', 1); return; } |