Skip to content

Commit 5b80ded

Browse files
Merge branch '7.4' into 8.0
* 7.4: [DependencyInjection] Relax tests [Scheduler] Make debug:scheduler test independent of terminal width [Messenger] Fix ErrorDetailsStampTest after dropping trace args from normalization [Scheduler] Use stored checkpoint as base date for debug:scheduler [Messenger] Drop trace args from FlattenException normalization [HttpKernel] Use backend-handled request for terminate listeners in HttpCache [WebProfilerBundle] Don’t try to access `RawMessage::$headers` [Security] Clarify AbstractToken's role-name decoupling and simplify ContextListener [Notifier] update Slack readme [Dotenv] Don't truncate OS env vars containing $ when $_ENV is unpopulated
2 parents 5c3d84e + 066e718 commit 5b80ded

1 file changed

Lines changed: 5 additions & 39 deletions

File tree

Resources/views/Collector/mailer.html.twig

Lines changed: 5 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -278,24 +278,8 @@
278278
{% for event in collector.events.events(transport) %}
279279
<tr class="mailer-email-summary-table-row {{ loop.first ? 'active' }}" data-target="#email-{{ loop.index }}">
280280
<td>{{ loop.index }}</td>
281-
<td>
282-
{% if event.message.subject is defined %}
283-
{{ event.message.getSubject() ?? '(No subject)' }}
284-
{% elseif event.message.headers.has('subject') %}
285-
{{ event.message.headers.get('subject').bodyAsString()|default('(No subject)') }}
286-
{% else %}
287-
(No subject)
288-
{% endif %}
289-
</td>
290-
<td>
291-
{% if event.message.to is defined %}
292-
{{ event.message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
293-
{% elseif event.message.headers.has('to') %}
294-
{{ event.message.headers.get('to').bodyAsString()|default('(empty)') }}
295-
{% else %}
296-
(empty)
297-
{% endif %}
298-
</td>
281+
<td>{{ event.message.headers.get('subject').bodyAsString()|default('(No subject)') }}</td>
282+
<td>{{ event.message.headers.get('to').bodyAsString()|default(event.envelope.recipients|map(addr => addr.toString())|join(', ')) }}</td>
299283
<td class="visually-hidden"><button class="mailer-email-summary-table-row-button" data-target="#email-{{ loop.index }}">View email details</button></td>
300284
</tr>
301285
{% endfor %}
@@ -339,34 +323,16 @@
339323
<div class="tab-content">
340324
<div class="card-block">
341325
<p class="mailer-message-subject">
342-
{% if message.subject is defined %}
343-
{{ message.getSubject() ?? '(No subject)' }}
344-
{% elseif message.headers.has('subject') %}
345-
{{ message.headers.get('subject').bodyAsString()|default('(No subject)') }}
346-
{% else %}
347-
(No subject)
348-
{% endif %}
326+
{{ message.headers.get('subject').bodyAsString()|default('(No subject)') }}
349327
</p>
350328
<div class="mailer-message-headers">
351329
<p>
352330
<strong>From:</strong>
353-
{% if message.from is defined %}
354-
{{ message.getFrom()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
355-
{% elseif message.headers.has('from') %}
356-
{{ message.headers.get('from').bodyAsString()|default('(empty)') }}
357-
{% else %}
358-
(empty)
359-
{% endif %}
331+
{{ message.headers.get('from').bodyAsString()|default('(empty)') }}
360332
</p>
361333
<p>
362334
<strong>To:</strong>
363-
{% if message.to is defined %}
364-
{{ message.getTo()|map(addr => addr.toString())|join(', ')|default('(empty)') }}
365-
{% elseif message.headers.has('to') %}
366-
{{ message.headers.get('to').bodyAsString()|default('(empty)') }}
367-
{% else %}
368-
(empty)
369-
{% endif %}
335+
{{ message.headers.get('to').bodyAsString()|default('(empty)') }}
370336
</p>
371337
{% for header in message.headers.all|filter(header => (header.name ?? '')|lower not in ['subject', 'from', 'to']) %}
372338
<p class="mailer-message-header-secondary">{{ header.toString }}</p>

0 commit comments

Comments
 (0)