Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

LEAF-4584 - Special Character in request email not displaying correctly #2599

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion LEAF-Automated-Tests
2 changes: 1 addition & 1 deletion LEAF_Request_Portal/sources/Email.php
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ function initNexusDB(): void
private function getHeaders(): string
{
$header = 'MIME-Version: 1.0';
$header .= "\r\nContent-type: text/html; charset=iso-8859-1";
$header .= "\r\nContent-type: text/html; charset=utf-8";
if ($this->emailSender == '') {
$header .= "\r\nFrom: {$this->emailFrom}";
} else {
Expand Down
2 changes: 1 addition & 1 deletion LEAF_Request_Portal/sources/FormWorkflow.php
Original file line number Diff line number Diff line change
Expand Up @@ -1672,7 +1672,7 @@ private function getFields(): array
default:
break;
}
$data = iconv('UTF-8', 'ISO-8859-1//TRANSLIT', $data);

$formattedFields["content"][$field['indicatorID']] = $data !== "" ? $data : $field["default"];
$formattedFields["to_cc_content"][$field['indicatorID']] = $emailValue;
}
Expand Down
Loading