Patch #13482 ยป suppress-empty-header-footer.patch
app/views/layouts/mailer.html.erb | ||
---|---|---|
25 | 25 |
</style> |
26 | 26 |
</head> |
27 | 27 |
<body> |
28 |
<% if not Setting.emails_header.empty? -%> |
|
28 | 29 |
<span class="header"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_header).html_safe %></span> |
30 |
<% end -%> |
|
29 | 31 |
<%= yield %> |
32 |
<% if not Setting.emails_footer.empty? -%> |
|
30 | 33 |
<hr /> |
31 | 34 |
<span class="footer"><%= Redmine::WikiFormatting.to_html(Setting.text_formatting, Setting.emails_footer).html_safe %></span> |
35 |
<% end -%> |
|
32 | 36 |
</body> |
33 | 37 |
</html> |
app/views/layouts/mailer.text.erb | ||
---|---|---|
1 |
<% if not Setting.emails_header.empty? -%> |
|
1 | 2 |
<%= Setting.emails_header %> |
3 |
<% end -%> |
|
2 | 4 |
<%= yield %> |
5 |
<% if not Setting.emails_footer.empty? -%> |
|
3 | 6 |
-- |
4 | 7 |
<%= Setting.emails_footer %> |
8 |
<% end -%> |