sascha
/
Notes
mirror of https://github.com/TriliumNext/Notes
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'stable' 

# Conflicts:
#	src/routes/api/files.js
#	src/routes/api/note_revisions.js
#	src/routes/api/notes.js
#	src/services/image.js
pull/255/head
zadam 2022-06-13 23:04:54 +07:00
parent 6256bcde2d df3fdb59c5
commit d3ee0aa8a8
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/services/note_revisions.js
Unescape Escape View File

@ -1,9 +1,8 @@
"use strict";
const NoteRevision = require('../becca/entities/note_revision');
const dateUtils = require('./date_utils');
const log = require('./log');
const sql = require('./sql');
const protectedSession = require("./protected_session");
/**
* @param {Note} note
@ -11,6 +10,12 @@ const sql = require('./sql');
function protectNoteRevisions(note) {
for (const revision of note.getNoteRevisions()) {
if (note.isProtected !== revision.isProtected) {
if (!protectedSession.isProtectedSessionAvailable()) {
log.error("Protected session is not available to fix note revisions.");
return;
}
try {
const content = revision.getContent();