diff options
Diffstat (limited to 'app/Controllers/importExportController.php')
| -rw-r--r-- | app/Controllers/importExportController.php | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/app/Controllers/importExportController.php b/app/Controllers/importExportController.php index 6d37cc465..0de75d0ff 100644 --- a/app/Controllers/importExportController.php +++ b/app/Controllers/importExportController.php @@ -289,7 +289,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { */ private function importJson(string $article_file, bool $starred = false): bool { $article_object = json_decode($article_file, true); - if ($article_object == null) { + if (!is_array($article_object)) { if (FreshRSS_Context::$isCli) { fwrite(STDERR, 'FreshRSS error trying to import a non-JSON file' . "\n"); } else { @@ -299,14 +299,14 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { } $items = $article_object['items'] ?? $article_object; - $mark_as_read = FreshRSS_Context::$user_conf->mark_when['reception'] ? 1 : 0; + $mark_as_read = FreshRSS_Context::userConf()->mark_when['reception'] ? 1 : 0; $error = false; $article_to_feed = []; $nb_feeds = count($this->feedDAO->listFeeds()); $newFeedGuids = []; - $limits = FreshRSS_Context::$system_conf->limits; + $limits = FreshRSS_Context::systemConf()->limits; // First, we check feeds of articles are in DB (and add them if needed). foreach ($items as &$item) { @@ -601,7 +601,7 @@ class FreshRSS_importExport_Controller extends FreshRSS_ActionController { return; } - $username = Minz_User::name(); + $username = Minz_User::name() ?? '_'; $export_service = new FreshRSS_Export_Service($username); $export_opml = Minz_Request::paramBoolean('export_opml'); |