diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2017-07-07 11:05:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-07 11:05:00 +0200 |
| commit | b4deba207856e92adfbf7239ea7d2420157993dd (patch) | |
| tree | 22bc71158a91e74e1d28c639c0801a735a78db76 /apps/dav | |
| parent | b1520a645833c2047103a2cf550f5c21b1c25586 (diff) | |
| parent | ca3a6ec6077e4248d56550b1acb19ab72546e808 (diff) | |
| download | nextcloud-server-b4deba207856e92adfbf7239ea7d2420157993dd.tar.gz nextcloud-server-b4deba207856e92adfbf7239ea7d2420157993dd.zip | |
Merge pull request #5483 from nextcloud/issue-5075-png-files-for-activity-emails
Use PNGs for icons in activity emails
Diffstat (limited to 'apps/dav')
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Calendar.php | 6 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Event.php | 6 | ||||
| -rw-r--r-- | apps/dav/lib/CalDAV/Activity/Provider/Todo.php | 6 |
3 files changed, 15 insertions, 3 deletions
diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php index d7730da61f4..6082e68dcd2 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Calendar.php @@ -84,7 +84,11 @@ class Calendar extends Base { $this->l = $this->languageFactory->get('dav', $language); - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); + if ($this->activityManager->getRequirePNG()) { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); + } else { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); + } if ($event->getSubject() === self::SUBJECT_ADD) { $subject = $this->l->t('{actor} created calendar {calendar}'); diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Event.php b/apps/dav/lib/CalDAV/Activity/Provider/Event.php index daaace6b5be..b591eaa351c 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Event.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Event.php @@ -80,7 +80,11 @@ class Event extends Base { $this->l = $this->languageFactory->get('dav', $language); - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); + if ($this->activityManager->getRequirePNG()) { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.png'))); + } else { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'places/calendar-dark.svg'))); + } if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_event') { $subject = $this->l->t('{actor} created event {event} in calendar {calendar}'); diff --git a/apps/dav/lib/CalDAV/Activity/Provider/Todo.php b/apps/dav/lib/CalDAV/Activity/Provider/Todo.php index 747b39ddb7f..0ad1d137455 100644 --- a/apps/dav/lib/CalDAV/Activity/Provider/Todo.php +++ b/apps/dav/lib/CalDAV/Activity/Provider/Todo.php @@ -40,7 +40,11 @@ class Todo extends Event { $this->l = $this->languageFactory->get('dav', $language); - $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg'))); + if ($this->activityManager->getRequirePNG()) { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.png'))); + } else { + $event->setIcon($this->url->getAbsoluteURL($this->url->imagePath('core', 'actions/checkmark.svg'))); + } if ($event->getSubject() === self::SUBJECT_OBJECT_ADD . '_todo') { $subject = $this->l->t('{actor} created todo {todo} in list {calendar}'); |