Skip to content

Commit f94e8f3

Browse files
authored
Merge pull request #26356 from nextcloud/backport/26342/stable20
[stable20] Fix broken Calendar Event Invite email icons in Gmail by using PNGs instead of SVGs
2 parents 9f8757d + 03df8ab commit f94e8f3

File tree

8 files changed

+7
-7
lines changed

8 files changed

+7
-7
lines changed

apps/dav/lib/CalDAV/Schedule/IMipPlugin.php

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -531,24 +531,24 @@ private function addSubjectAndHeading(IEMailTemplate $template, IL10N $l10n,
531531
private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
532532
if ($vevent->SUMMARY) {
533533
$template->addBodyListItem($vevent->SUMMARY, $l10n->t('Title:'),
534-
$this->getAbsoluteImagePath('caldav/title.svg'),'','',self::IMIP_INDENT);
534+
$this->getAbsoluteImagePath('caldav/title.png'),'','',self::IMIP_INDENT);
535535
}
536536
$meetingWhen = $this->generateWhenString($l10n, $vevent);
537537
if ($meetingWhen) {
538538
$template->addBodyListItem($meetingWhen, $l10n->t('Time:'),
539-
$this->getAbsoluteImagePath('caldav/time.svg'),'','',self::IMIP_INDENT);
539+
$this->getAbsoluteImagePath('caldav/time.png'),'','',self::IMIP_INDENT);
540540
}
541541
if ($vevent->LOCATION) {
542542
$template->addBodyListItem($vevent->LOCATION, $l10n->t('Location:'),
543-
$this->getAbsoluteImagePath('caldav/location.svg'),'','',self::IMIP_INDENT);
543+
$this->getAbsoluteImagePath('caldav/location.png'),'','',self::IMIP_INDENT);
544544
}
545545
if ($vevent->URL) {
546546
$url = $vevent->URL->getValue();
547547
$template->addBodyListItem(sprintf('<a href="%s">%s</a>',
548548
htmlspecialchars($url),
549549
htmlspecialchars($url)),
550550
$l10n->t('Link:'),
551-
$this->getAbsoluteImagePath('caldav/link.svg'),
551+
$this->getAbsoluteImagePath('caldav/link.png'),
552552
$url,'',self::IMIP_INDENT);
553553
}
554554

@@ -557,7 +557,7 @@ private function addBulletList(IEMailTemplate $template, IL10N $l10n, $vevent) {
557557
/* Put description last, like an email body, since it can be arbitrarily long */
558558
if ($vevent->DESCRIPTION) {
559559
$template->addBodyListItem($vevent->DESCRIPTION->getValue(), $l10n->t('Description:'),
560-
$this->getAbsoluteImagePath('caldav/description.svg'),'','',self::IMIP_INDENT);
560+
$this->getAbsoluteImagePath('caldav/description.png'),'','',self::IMIP_INDENT);
561561
}
562562
}
563563

@@ -603,7 +603,7 @@ private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vev
603603
}
604604
}
605605
$template->addBodyListItem($organizerHTML, $l10n->t('Organizer:'),
606-
$this->getAbsoluteImagePath('caldav/organizer.svg'),
606+
$this->getAbsoluteImagePath('caldav/organizer.png'),
607607
$organizerText,'',self::IMIP_INDENT);
608608
}
609609

@@ -632,7 +632,7 @@ private function addAttendees(IEMailTemplate $template, IL10N $l10n, VEvent $vev
632632
}
633633

634634
$template->addBodyListItem(implode('<br/>',$attendeesHTML), $l10n->t('Attendees:'),
635-
$this->getAbsoluteImagePath('caldav/attendees.svg'),
635+
$this->getAbsoluteImagePath('caldav/attendees.png'),
636636
implode("\n",$attendeesText),'',self::IMIP_INDENT);
637637
}
638638

core/img/caldav/attendees.png

446 Bytes
Loading

core/img/caldav/description.png

166 Bytes
Loading

core/img/caldav/link.png

412 Bytes
Loading

core/img/caldav/location.png

358 Bytes
Loading

core/img/caldav/organizer.png

337 Bytes
Loading

core/img/caldav/time.png

243 Bytes
Loading

core/img/caldav/title.png

160 Bytes
Loading

0 commit comments

Comments
 (0)