Merge pull request #24051 from nextcloud/backport/23915/stable18

[stable18] Use png icons in caldav reminder emails

6 files changed, 8 insertions, 8 deletions

diff --git a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
index 74c5d2348f5..e3c471521f4 100644
--- a/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
+++ b/apps/dav/lib/CalDAV/Reminder/NotificationProvider/EmailProvider.php
@@ -154,18 +154,18 @@ class EmailProvider extends AbstractProvider {
 								   string $calendarDisplayName,
 								   VEvent $vevent):void {
 		$template->addBodyListItem($calendarDisplayName, $l10n->t('Calendar:'),
-			$this->getAbsoluteImagePath('actions/info.svg'));
+			$this->getAbsoluteImagePath('actions/info.png'));
 
 		$template->addBodyListItem($this->generateDateString($l10n, $vevent), $l10n->t('Date:'),
-			$this->getAbsoluteImagePath('places/calendar.svg'));
+			$this->getAbsoluteImagePath('places/calendar.png'));
 
 		if (isset($vevent->LOCATION)) {
 			$template->addBodyListItem((string) $vevent->LOCATION, $l10n->t('Where:'),
-				$this->getAbsoluteImagePath('actions/address.svg'));
+				$this->getAbsoluteImagePath('actions/address.png'));
 		}
 		if (isset($vevent->DESCRIPTION)) {
 			$template->addBodyListItem((string) $vevent->DESCRIPTION, $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('actions/more.svg'));
+				$this->getAbsoluteImagePath('actions/more.png'));
 		}
 	}
 
diff --git a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
index 2d04c605fcf..c07259f9cd7 100644
--- a/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
+++ b/apps/dav/tests/unit/CalDAV/Reminder/NotificationProvider/EmailProviderTest.php
@@ -502,7 +502,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 			$this->urlGenerator
 				->expects($this->at(8 * $i))
 				->method('imagePath')
-				->with('core', 'actions/info.svg')
+				->with('core', 'actions/info.png')
 				->willReturn('imagePath1');
 
 			$this->urlGenerator
@@ -514,7 +514,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 			$this->urlGenerator
 				->expects($this->at(8 * $i + 2))
 				->method('imagePath')
-				->with('core', 'places/calendar.svg')
+				->with('core', 'places/calendar.png')
 				->willReturn('imagePath2');
 
 			$this->urlGenerator
@@ -526,7 +526,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 			$this->urlGenerator
 				->expects($this->at(8 * $i + 4))
 				->method('imagePath')
-				->with('core', 'actions/address.svg')
+				->with('core', 'actions/address.png')
 				->willReturn('imagePath3');
 
 			$this->urlGenerator
@@ -538,7 +538,7 @@ class EmailProviderTest extends AbstractNotificationProviderTest {
 			$this->urlGenerator
 				->expects($this->at(8 * $i + 6))
 				->method('imagePath')
-				->with('core', 'actions/more.svg')
+				->with('core', 'actions/more.png')
 				->willReturn('imagePath4');
 
 			$this->urlGenerator
diff --git a/core/img/actions/address.png b/core/img/actions/address.png
new file mode 100644
index 00000000000..8c5c4ccbc35
--- /dev/null
+++ b/core/img/actions/address.png
diff --git a/core/img/actions/info.png b/core/img/actions/info.png
new file mode 100644
index 00000000000..69503b54dcd
--- /dev/null
+++ b/core/img/actions/info.png
diff --git a/core/img/actions/more.png b/core/img/actions/more.png
new file mode 100644
index 00000000000..70cac71e7ef
--- /dev/null
+++ b/core/img/actions/more.png
diff --git a/core/img/places/calendar.png b/core/img/places/calendar.png
new file mode 100644
index 00000000000..06efc29546d
--- /dev/null
+++ b/core/img/places/calendar.png