amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-04 02:55:26 +00:00
Code Issues Projects Releases Wiki Activity

fix(mail): render properly the subject v2

Browse Source
This commit is contained in:
Hivert Quentin
2026-05-03 16:57:25 +02:00
parent 67ce01ec2a
commit 29d0bbc9eb
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/MailerUI/UIxMailListActions.m
+1 -1
View File
@@ -1178,7 +1178,7 @@
[msg addObject: [NSNumber numberWithBool: [self isMessageFlagged]]];
// Subject
[msg addObject: [[self messageSubject] stringWithoutHTMLInjection: YES]];
[msg addObject: [[[self messageSubject] stringWithoutHTMLInjection: YES] stringWithoutHTMLInjection: NO]];
// From
from = [[message objectForKey: @"envelope"] from];
UI/MailerUI/UIxMailView.m
+1 -1
View File
@@ -363,7 +363,7 @@ static NSString *mailETag = nil;
if ([self formattedDate])
[data setObject: [self formattedDate] forKey: @"date"];
if ([self messageSubject])
[data setObject: [[self messageSubject] stringWithoutHTMLInjection: YES] forKey: @"subject"];
[data setObject: [[[self messageSubject] stringWithoutHTMLInjection: YES] stringWithoutHTMLInjection: NO] forKey: @"subject"];
if ((addresses = [addressFormatter dictionariesForArray: [co fromEnvelopeAddresses]]))
[data setObject: addresses forKey: @"from"];
if ((addresses = [addressFormatter dictionariesForArray: [co toEnvelopeAddresses]]))
UI/Templates/MailerUI/UIxMailViewTemplate.wox
+1 -1
View File
@@ -194,7 +194,7 @@
</md-card-actions>
<md-card-content>
<div class="sg-padded">
<h5 class="sg-md-headline" ng-bind-html="viewer.message.subject"><!-- subject --></h5>
<h5 class="sg-md-headline" ng-bind="viewer.message.subject"><!-- subject --></h5>
<time class="msg-date" datetime="viewer.message.date" ng-bind="::viewer.message.date"><!-- date --></time>
</div>
<div layout="row" layout-wrap="layout-wrap">
UI/WebServerResources/js/Mailer/Message.service.js
+2 -1
View File
@@ -525,7 +525,7 @@
&& data
&& -1 === data.indexOf("data-markjs")) {
var dom = document.createElement("DIV");
dom.innerHTML = encodeEntities ? data.encodeEntities() : data;
dom.textContent = encodeEntities ? data.encodeEntities() : data;
var markInstance = new Mark(dom);
markInstance.mark(this.$mailbox.getHighlightWords());
data = dom.innerHTML;
@@ -537,6 +537,7 @@
return data;
};
/**
* @function getHighlightSubject
* @memberof Message.prototype