Skip to content
Snippets Groups Projects
Unverified Commit 9d4c5eb8 authored by Vincent Brillault's avatar Vincent Brillault
Browse files

Remove patch already applied in CERN's repo

parent c1a8be6e
Branches
Tags
No related merge requests found
...@@ -11,10 +11,6 @@ sed -ri \ ...@@ -11,10 +11,6 @@ sed -ri \
-e '/The configured LOGERRORFILE can not be modified./ s/^.*$/true;/' \ -e '/The configured LOGERRORFILE can not be modified./ s/^.*$/true;/' \
./lib/core/zpush.php ./lib/core/zpush.php
# Workaround to make calendars actually writable
echo "Applying patches"
patch -p2 < 01_fix_caldav_events.patch
echo "Assembling" echo "Assembling"
/usr/libexec/s2i/assemble /usr/libexec/s2i/assemble
......
From 19f32af87b32e5c171d2bfa767717767e26e4a07 Mon Sep 17 00:00:00 2001
From: Giacomo Tenaglia <Giacomo.Tenaglia@cern.ch>
Date: Wed, 9 Dec 2020 15:51:04 +0100
Subject: [PATCH] CalDAV: add missing DESCRIPTION for VALARM of ACTION:DISPLAY
---
src/backend/caldav/caldav.php | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/backend/caldav/caldav.php b/src/backend/caldav/caldav.php
index feeb3543..f782badb 100644
--- a/src/backend/caldav/caldav.php
+++ b/src/backend/caldav/caldav.php
@@ -1227,6 +1227,7 @@ class BackendCalDAV extends BackendDiff {
if (isset($data->reminder)) {
$valarm = $vcal->createComponent('VALARM');
$valarm->add('ACTION', "DISPLAY");
+ $valarm->add('DESCRIPTION', 'Default Z-Push description');
$valarm->add('TRIGGER', "-PT".$data->reminder."M", ['RELATED' => "START"]);
$vevent->add($valarm);
}
@@ -1632,6 +1633,7 @@ class BackendCalDAV extends BackendDiff {
if ($data->reminderset && $data->remindertime) {
$valarm = $vcal->createComponent('VALARM');
$valarm->add('ACTION', "DISPLAY");
+ $valarm->add('DESCRIPTION', 'Default Z-Push description');
$valarm->add('TRIGGER', gmdate("Ymd\THis\Z", $data->remindertime), ['VALUE' => "DATE-TIME"]);
$vtodo->add($valarm);
}
--
2.29.2
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment