zadam/trilium
1
1
Fork 0
mirror of https://github.com/zadam/trilium.git synced 2024-09-20 23:55:59 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/stable'

Browse source
This commit is contained in:
zadam 2020-03-19 09:44:00 +01:00
parent debce78c7f 9a1a76605a
commit 789f12ac8f
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/services/export/opml.js
View file

@ -16,7 +16,7 @@ async function exportToOpml(taskContext, branch, version, res) {
const branch = await repository.getBranch(branchId); const branch = await repository.getBranch(branchId);
const note = await branch.getNote(); const note = await branch.getNote();
if (!note.isStringNote() || await note.hasOwnedLabel('excludeFromExport')) { if (await note.hasOwnedLabel('excludeFromExport')) {
return; return;
} }
@ -24,13 +24,13 @@ async function exportToOpml(taskContext, branch, version, res) {
if (opmlVersion === 1) { if (opmlVersion === 1) {
const preparedTitle = escapeXmlAttribute(title); const preparedTitle = escapeXmlAttribute(title);
const preparedContent = prepareText(await note.getContent()); const preparedContent = note.isStringNote() ? prepareText(await note.getContent()) : '';
res.write(`<outline title="${preparedTitle}" text="${preparedContent}">\n`); res.write(`<outline title="${preparedTitle}" text="${preparedContent}">\n`);
} }
else if (opmlVersion === 2) { else if (opmlVersion === 2) {
const preparedTitle = escapeXmlAttribute(title); const preparedTitle = escapeXmlAttribute(title);
const preparedContent = escapeXmlAttribute(await note.getContent()); const preparedContent = note.isStringNote() ? escapeXmlAttribute(await note.getContent()) : '';
res.write(`<outline text="${preparedTitle}" _note="${preparedContent}">\n`); res.write(`<outline text="${preparedTitle}" _note="${preparedContent}">\n`);
} }