mirror/FreshRSS
0
0
Fork 0
mirror of https://github.com/FreshRSS/FreshRSS.git synced 2026-04-28 10:18:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Error edge cases for JSON export

Browse Source
This commit is contained in:
Alexandre Alapetite
2016-11-16 17:49:20 +01:00
parent 568b737b6c
commit 1d5006d83f
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/views/helpers/export/articles.phtml
View File

@@ -17,9 +17,15 @@ echo rtrim(json_encode($articles, $options), " ]}\n\r\t"), "\n";
$first = true;
foreach ($this->entriesRaw as $entryRaw) {
if (empty($entryRaw)) {
continue;
}
$entry = FreshRSS_EntryDAO::daoToEntry($entryRaw);
if (!isset($this->feed)) {
$feed = FreshRSS_CategoryDAO::findFeed($this->categories, $entry->feed());
if ($feed == null) {
$feed = $entry->feed(true);
}
} else {
$feed = $this->feed;
}
@@ -39,19 +45,22 @@ foreach ($this->entriesRaw as $entryRaw) {
'content' => $entry->content(),
),
'origin' => array(
'streamId' => $feed->id(),
'title' => $feed->name(),
'htmlUrl' => $feed->website(),
'feedUrl' => $feed->url(),
'streamId' => $feed == null ? '' : $feed->id(),
'title' => $feed == null ? '' : $feed->name(),
'htmlUrl' => $feed == null ? '' : $feed->website(),
'feedUrl' => $feed == null ? '' : $feed->url(),
)
);
if ($first) {
$first = false;
} else {
echo ",\n";
$line = json_encode($article, $options);
if ($line != '') {
if ($first) {
$first = false;
} else {
echo ",\n";
}
echo $line;
}
echo json_encode($article, $options);
}
echo "\n]}\n";