Merge pull request #26357 from nextcloud/backport/26342/stable21

[stable21] Fix broken Calendar Event Invite email icons in Gmail by using PNGs instead of SVGs
nextcloud · Mar 29, 2021 · 2cc0fd0 · 2cc0fd0
2 parents a956c53 + e7aefc3
commit 2cc0fd0
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 7 deletions.
diff --git a/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php b/apps/dav/lib/CalDAV/Schedule/IMipPlugin.php
@@ -531,24 +531,24 @@ private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
 	private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
 		if ($vevent->SUMMARY) {
 			$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
-				$this->getAbsoluteImagePath('caldav/title.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT);
 		}
 		$meetingWhen = $this->generateWhenString($l10n, $vevent);
 		if ($meetingWhen) {
 			$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
-				$this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT);
 		}
 		if ($vevent->LOCATION) {
 			$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
-				$this->getAbsoluteImagePath('caldav/location.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT);
 		}
 		if ($vevent->URL) {
 			$url = $vevent->URL->getValue();
 			$template->addBodyListItem(sprintf('<a href="%s">%s</a>',
 					htmlspecialchars($url),
 					htmlspecialchars($url)),
 				$l10n->t('Link:'),
-				$this->getAbsoluteImagePath('caldav/link.svg'),
+				$this->getAbsoluteImagePath('caldav/link.png'),
 				$url,'',self::IMIP_INDENT);
 		}
 
@@ -557,7 +557,7 @@ private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
 		/* Put description last, like an email body, since it can be arbitrarily long */
 		if ($vevent->DESCRIPTION) {
 			$template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
-				$this->getAbsoluteImagePath('caldav/description.svg'),'','',self::IMIP_INDENT);
+				$this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT);
 		}
 	}
 
@@ -603,7 +603,7 @@ private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vev
 				}
 			}
 			$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
-				$this->getAbsoluteImagePath('caldav/organizer.svg'),
+				$this->getAbsoluteImagePath('caldav/organizer.png'),
 				$organizerText,'',self::IMIP_INDENT);
 		}
 
@@ -632,7 +632,7 @@ private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vev
 		}
 
 		$template->addBodyListItem(implode('<br/>',$attendeesHTML), $l10n->t('Attendees:'),
-			$this->getAbsoluteImagePath('caldav/attendees.svg'),
+			$this->getAbsoluteImagePath('caldav/attendees.png'),
 			implode("\n",$attendeesText),'',self::IMIP_INDENT);
 	}
 

diff --git a/core/img/caldav/attendees.png b/core/img/caldav/attendees.png
diff --git a/core/img/caldav/description.png b/core/img/caldav/description.png
diff --git a/core/img/caldav/link.png b/core/img/caldav/link.png
diff --git a/core/img/caldav/location.png b/core/img/caldav/location.png
diff --git a/core/img/caldav/organizer.png b/core/img/caldav/organizer.png
diff --git a/core/img/caldav/time.png b/core/img/caldav/time.png
diff --git a/core/img/caldav/title.png b/core/img/caldav/title.png