EMailTemplate: Fix button background in Lotus Notes#10291
EMailTemplate: Fix button background in Lotus Notes#10291MorrisJobke merged 3 commits intomasterfrom
Conversation
…endering in lotus notes Signed-off-by: Julius Härtl <[email protected]>
|
Okay, I will test this. |
|
That also means that any possible changed templates out there will not work anymore, because of the changed order of parameters. |
|
@juliushaertl Could you fix the unit tests as you changed the result HTML |
Ah so the custom templates only change the template strings :/ We should consider moving this to some template engine then, so we can have proper named parameters in the template string. (maybe something for 15) |
Or just use named replacements ;) But yes - something for 15 and we document it just and are done ;) |
|
Ok, let me fix the tests... |
lib/private/Mail/EMailTemplate.php
Outdated
| $textColor = $this->themingDefaults->getTextColorPrimary(); | ||
|
|
||
| $this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]); | ||
| $this->htmlBody .= vsprintf($this->buttonGroup, [$color, $color, $color, $urlLeft, $color, $textColor, $textColor, $textLeft, $urlRight, $textRight]); |
There was a problem hiding this comment.
You can simply move the new value to the end and replace all %s with their %1$s equivalents.
That would keep compatibility
Signed-off-by: Julius Härtl <[email protected]>
Signed-off-by: Julius Härtl <[email protected]>
36b7f56 to
1213a7c
Compare
|
Thanks @nickvergessen for the hint 👍 Fixed that so we don't break compatibility. The failing test is unrelated. |
|
Changes from EMailTemplate.php are tested and working. |
I cannot test this, but according to #10052 and https://www.campaignmonitor.com/css/email-client/ibm-notes-9/ it should work. 🙈
@michag86 Can you maybe test this and prove that it works?