diff options
author | Morris Jobke <hey@morrisjobke.de> | 2018-11-01 16:30:22 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-11-01 16:30:22 +0100 |
commit | 35a7ea869e4d63761e4a11c3d96a77a6a5e3418f (patch) | |
tree | 5219b9951867e97c51465fecbcf6609bf6be6373 | |
parent | d842cd1eecac54e025a533a857f6baaeefa922cc (diff) | |
parent | 3442ffeb54a845572f38ba6e80c3828af60f3ea5 (diff) | |
download | nextcloud-server-35a7ea869e4d63761e4a11c3d96a77a6a5e3418f.tar.gz nextcloud-server-35a7ea869e4d63761e4a11c3d96a77a6a5e3418f.zip |
Merge pull request #12152 from brad2014/bugfix/12151/fix-emailtemplate-list-formatting
Fix issue #12151: fix list formatting by correcting malformed html
-rw-r--r-- | lib/private/Mail/EMailTemplate.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/private/Mail/EMailTemplate.php b/lib/private/Mail/EMailTemplate.php index 4c56a316042..05a884a67fa 100644 --- a/lib/private/Mail/EMailTemplate.php +++ b/lib/private/Mail/EMailTemplate.php @@ -185,12 +185,13 @@ EOF; </table> EOF; + // note: listBegin (like bodyBegin) is not processed through sprintf, so "%" is not escaped as "%%". (bug #12151) protected $listBegin = <<<EOF -<table class="row description" style="border-collapse:collapse;border-spacing:0;display:table;padding:0;position:relative;text-align:left;vertical-align:top;width:100%%"> +<table class="row description" style="border-collapse:collapse;border-spacing:0;display:table;padding:0;position:relative;text-align:left;vertical-align:top;width:100%"> <tbody> <tr style="padding:0;text-align:left;vertical-align:top"> <th class="small-12 large-12 columns first last" style="Margin:0 auto;color:#0a0a0a;font-family:Lucida Grande,Geneva,Verdana,sans-serif;font-size:16px;font-weight:400;line-height:1.3;margin:0 auto;padding:0;padding-bottom:30px;padding-left:30px;padding-right:30px;text-align:left;width:550px"> - <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%%"> + <table style="border-collapse:collapse;border-spacing:0;padding:0;text-align:left;vertical-align:top;width:100%"> EOF; protected $listItem = <<<EOF |