Skip to content

fix: add missing space to mail footer signature delimiter#41617

Merged
phil-davis merged 2 commits into
masterfrom
fix/41364-mail-footer-signature-delimiter
Jun 12, 2026
Merged

fix: add missing space to mail footer signature delimiter#41617
phil-davis merged 2 commits into
masterfrom
fix/41364-mail-footer-signature-delimiter

Conversation

@DeepDiver1975

Copy link
Copy Markdown
Member

Description

The signature delimiter on the first line of the mail footer templates was missing the trailing space required by the signature block convention (RFC 3676). The delimiter must be exactly -- (dash-dash-space) followed by a line break for mail clients to recognize and collapse the signature.

  • core/templates/plain.mail.footer.php: ----
  • core/templates/html.mail.footer.php: --<br>-- <br>

How was this tested?

  • Verified the exact bytes of line 1 in both files (cat -A shows -- $ and -- <br>$).
  • Confirmed php-cs-fixer does not strip the trailing space: although the coding standard enables no_trailing_whitespace and these templates are not excluded, line 1 is an inline-HTML token (T_INLINE_HTML) which the rule does not touch — dry-run reports 0 of 2 files to fix.
  • php -l passes on both templates.

Fixes #41364

🤖 Generated with Claude Code

The signature delimiter on the first line of the mail footer templates was
missing the trailing space required by the signature block convention
(RFC 3676). Without "-- " (dash-dash-space) followed by a line break, mail
clients cannot recognize and collapse the signature.

Fixes #41364

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is it OK that this changelog file is named 41364 but the PR is now 41617?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch — I've renamed the file to 41617 to match the PR number and added the PR link alongside the issue link. Thanks!

@DeepDiver1975 DeepDiver1975 left a comment

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

Overview: Single-character fix — adds the trailing space to the email footer signature delimiter in both the HTML and plain-text mail footer templates.

The fix: ---- (dash-dash-space). This is the correct RFC 3676 / email convention signature delimiter. Mail clients (Thunderbird, Mutt, etc.) recognize -- \n as the separator between message body and signature and use it to visually collapse or style the signature block. Without the trailing space, clients treat it as body text.

Files changed:

  • core/templates/html.mail.footer.php---<br>-- <br> (also removes the erroneous third dash)
  • core/templates/plain.mail.footer.php----- (same correction)

Note: The HTML template previously had three dashes (---), which was doubly wrong. This fix corrects both the dash count and the missing space in one change.

Changelog entry: changelog/unreleased/41364 is well-written and correctly references the RFC 3676 convention.

No concerns. Clean minimal fix.

Renames changelog/unreleased/41364 to 41617 to match the PR number and adds
the PR link, addressing review feedback on #41617.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Thomas Müller <1005065+DeepDiver1975@users.noreply.github.com>
@phil-davis phil-davis merged commit 72798fa into master Jun 12, 2026
45 of 46 checks passed
@phil-davis phil-davis deleted the fix/41364-mail-footer-signature-delimiter branch June 12, 2026 08:23
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Mail footer files not correct

3 participants