Overview
Comment:Always overwrite content when using a template, even if the mail is in HTML, as we need to provide a text/plain alternative
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk | stable | 1.1.25
Files: files | file ages | folders
SHA3-256: d4e42bf765d4fa95fa0bf121bbe40de519e1dfaa9f27e6a87d467a45a8294dc0
User & Date: bohwaz on 2022-06-04 01:15:16
Other Links: manifest | tags
Context
2022-06-04
10:53
Move UserException class to separate file check-in: b084a07359 user: bohwaz tags: trunk, stable
01:15
Always overwrite content when using a template, even if the mail is in HTML, as we need to provide a text/plain alternative check-in: d4e42bf765 user: bohwaz tags: trunk, stable, 1.1.25
2022-06-03
21:32
Fix when some result is NULL check-in: 10651446d5 user: bohwaz tags: trunk, stable
Changes

Modified src/include/lib/Garradin/Users/Emails.php from [4c22935f75] to [d022334e7e].

86
87
88
89
90
91
92
93

94
95
96
97
98
99
100
101
102
103
104
105
106
107
			$hash = Email::getHash($to);

			$content_html = null;

			if ($template) {
				$template->assignArray((array) $variables);

				if ($render) {

					$content_html = $template->fetch();
				}
				else {
					// Disable HTML escaping for plaintext emails
					$template->setEscapeDefault(null);
					$content = $template->fetch();
				}
			}

			if ($render) {
				$content_html = Render::render($render, null, $content_html ?? $content);
			}

			if ($content_html) {







|
>
|
|
|
<
|
|








86
87
88
89
90
91
92
93
94
95
96
97

98
99
100
101
102
103
104
105
106
107
			$hash = Email::getHash($to);

			$content_html = null;

			if ($template) {
				$template->assignArray((array) $variables);

				// Disable HTML escaping for plaintext emails
				$template->setEscapeDefault(null);
				$content = $template->fetch();

				if ($render) {

					$template->setEscapeDefault('html');
					$content_html = $template->fetch();
				}
			}

			if ($render) {
				$content_html = Render::render($render, null, $content_html ?? $content);
			}

			if ($content_html) {