Merge remote-tracking branch 'origin/math2'

# Conflicts:
#	package-lock.json
This commit is contained in:
zadam
2020-10-26 21:44:18 +01:00
6 changed files with 15 additions and 12 deletions

View File

@@ -38,7 +38,8 @@ async function searchFromNote(req) {
}
if (note.isDeleted) {
return [400, `Note ${req.params.noteId} is deleted.`];
// this can be triggered from recent changes and it's harmless to return empty list rather than fail
return [];
}
if (note.type !== 'search') {