Skip to content

Commit 0c7bed2

Browse files
authored
Merge pull request #23915 from st3iny/fix/noid/png-icons-in-caldav-reminder-emails
Use png icons in caldav reminder emails
2 parents 410e295 + f1c242c commit 0c7bed2

File tree

6 files changed

+8
-8
lines changed

6 files changed

+8
-8
lines changed

apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,18 +155,18 @@ private function addBulletList(IEMailTemplate $template,
155155
string $calendarDisplayName,
156156
VEvent $vevent):void {
157157
$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
158-
$this->getAbsoluteImagePath('actions/info.svg'));
158+
$this->getAbsoluteImagePath('actions/info.png'));
159159

160160
$template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
161-
$this->getAbsoluteImagePath('places/calendar.svg'));
161+
$this->getAbsoluteImagePath('places/calendar.png'));
162162

163163
if (isset($vevent->LOCATION)) {
164164
$template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
165-
$this->getAbsoluteImagePath('actions/address.svg'));
165+
$this->getAbsoluteImagePath('actions/address.png'));
166166
}
167167
if (isset($vevent->DESCRIPTION)) {
168168
$template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
169-
$this->getAbsoluteImagePath('actions/more.svg'));
169+
$this->getAbsoluteImagePath('actions/more.png'));
170170
}
171171
}
172172

apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -478,7 +478,7 @@ private function setupURLGeneratorMock(int $times = 1):void {
478478
$this->urlGenerator
479479
->expects($this->at(8 * $i))
480480
->method('imagePath')
481-
->with('core', 'actions/info.svg')
481+
->with('core', 'actions/info.png')
482482
->willReturn('imagePath1');
483483

484484
$this->urlGenerator
@@ -490,7 +490,7 @@ private function setupURLGeneratorMock(int $times = 1):void {
490490
$this->urlGenerator
491491
->expects($this->at(8 * $i + 2))
492492
->method('imagePath')
493-
->with('core', 'places/calendar.svg')
493+
->with('core', 'places/calendar.png')
494494
->willReturn('imagePath2');
495495

496496
$this->urlGenerator
@@ -502,7 +502,7 @@ private function setupURLGeneratorMock(int $times = 1):void {
502502
$this->urlGenerator
503503
->expects($this->at(8 * $i + 4))
504504
->method('imagePath')
505-
->with('core', 'actions/address.svg')
505+
->with('core', 'actions/address.png')
506506
->willReturn('imagePath3');
507507

508508
$this->urlGenerator
@@ -514,7 +514,7 @@ private function setupURLGeneratorMock(int $times = 1):void {
514514
$this->urlGenerator
515515
->expects($this->at(8 * $i + 6))
516516
->method('imagePath')
517-
->with('core', 'actions/more.svg')
517+
->with('core', 'actions/more.png')
518518
->willReturn('imagePath4');
519519

520520
$this->urlGenerator

core/img/actions/address.png

438 Bytes
Loading

core/img/actions/info.png

230 Bytes
Loading

core/img/actions/more.png

182 Bytes
Loading

core/img/places/calendar.png

294 Bytes
Loading

0 commit comments

Comments
 (0)