From 6ae1ca93fdbad719d28e6b524f694e1240038c93 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 11 Jun 2014 09:15:43 +0000 Subject: [PATCH] fixed ACTION:NONE was not detected because of missing multiline switch, causing empty pref reset to 0 --- calendar/inc/class.calendar_hooks.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_hooks.inc.php b/calendar/inc/class.calendar_hooks.inc.php index 2c337329da..bfe5632834 100644 --- a/calendar/inc/class.calendar_hooks.inc.php +++ b/calendar/inc/class.calendar_hooks.inc.php @@ -771,7 +771,7 @@ class calendar_hooks if (!isset($val)) // no calendar pref --> read value from caldav { $matches = null; - if (preg_match('/^ACTION:NONE$/i', $pref)) + if (preg_match('/^ACTION:NONE$/mi', $pref)) { $val = ''; } @@ -817,7 +817,7 @@ END:VALARM'; $pref = preg_replace('/^TRIGGER:.*$/m', $trigger.number_format(abs($val)/60, 0).'H', $pref); } $GLOBALS['egw']->preferences->add('groupdav', $dav, $pref, 'user'); - error_log(__METHOD__."() storing $name=$val --> $dav='$pref'"); + //error_log(__METHOD__."() storing $name=$val --> $dav='$pref'"); } } }