From 92fcec4acb88873055dcb88d8ed9651404da2849 Mon Sep 17 00:00:00 2001 From: Nathan Gray Date: Wed, 23 Feb 2011 21:02:22 +0000 Subject: [PATCH] Change marker detection to be more flexible, allowing for IF, NELF, etc --- calendar/inc/class.calendar_merge.inc.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calendar/inc/class.calendar_merge.inc.php b/calendar/inc/class.calendar_merge.inc.php index d7ae9b1dda..9cec2679b5 100644 --- a/calendar/inc/class.calendar_merge.inc.php +++ b/calendar/inc/class.calendar_merge.inc.php @@ -228,7 +228,7 @@ class calendar_merge extends bo_merge } $days[date('Ymd',$_date)][$dow][] = $this->calendar_replacements($event); } - if(strpos($repeat, '$$day/date$$') !== false || strpos($repeat, '$$day/name$$') !== false) { + if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) { $date_marker = array( '$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)), '$$day/name$$' => lang(date('l', strtotime($day))) @@ -300,7 +300,7 @@ class calendar_merge extends bo_merge { $days[date('Ymd',$_date)][$plugin][] = $this->calendar_replacements($event); } - if(strpos($repeat, '$$day/date$$') !== false || strpos($repeat, '$$day/name$$') !== false) { + if(strpos($repeat, 'day/date') !== false || strpos($repeat, 'day/name') !== false) { $date_marker = array( '$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)), '$$day/name$$' => lang(date('l', strtotime($day)))