Merge pull request #1301 from SergeyMosin/mailbox-uri-fix

Fix: '#/mailbox/folder/mUID/search' uri/route handling
This commit is contained in:
the-djmaze 2023-11-15 00:42:49 +01:00 committed by GitHub
commit e7d7ca48e4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 12 deletions

View file

@ -301,10 +301,14 @@ populateMessageBody = (oMessage, popup) => {
} else {
let json = oData?.Result;
if (json
&& oMessage.hash === json.hash
// && oMessage.folder === json.folder
// && oMessage.uid == json.uid
&& oMessage.revivePropertiesFromJson(json)
&& ((
oMessage.hash && oMessage.hash === json.hash
) || (
!oMessage.hash
&& oMessage.folder === json.folder
&& oMessage.uid == json.uid)
)
&& oMessage.revivePropertiesFromJson(json)
) {
/*
if (bCached) {