Wavyzz/dolibarr-fork
2
0
Fork 0
forked from Wavyzz/dolibarr
Code Pull Requests Activity

Fix html entities when we should not

Browse Source
This commit is contained in:
Laurent Destailleur
2021-07-21 01:40:45 +02:00
parent 23f708c0d4
commit 062c39c40d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/comm/action/class/actioncomm.class.php
View File

@@ -2340,7 +2340,7 @@ class ActionComm extends CommonObject
$sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray); $sendContent = make_substitutions($langs->trans($arraymessage->content), $substitutionarray);
//Topic //Topic
$sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->trans('EventReminder')); $sendTopic = (!empty($arraymessage->topic)) ? $arraymessage->topic : html_entity_decode($langs->transnoentities('EventReminder'));
// Recipient // Recipient
$recipient = new User($this->db); $recipient = new User($this->db);

4
htdocs/core/js/lib_notification.js.php
View File

@@ -131,8 +131,8 @@ function check_events() {
if (value.type == 'agenda') if (value.type == 'agenda')
{ {
url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda; url = '<?php print DOL_URL_ROOT.'/comm/action/card.php?id='; ?>' + value.id_agenda;
title = '<?php print dol_escape_js($langs->trans('EventReminder')) ?>'; title = '<?php print dol_escape_js($langs->transnoentities('EventReminder')) ?>';
} }
var extra = { var extra = {
icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>', icon: '<?php print DOL_URL_ROOT.'/theme/common/bell.png'; ?>',