extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 09:28:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Change marker detection to be more flexible, allowing for IF, NELF, etc

Browse Source
This commit is contained in:
Nathan Gray 2011-02-23 21:02:22 +00:00
parent e100e423d8
commit 92fcec4acb
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
calendar/inc/class.calendar_merge.inc.php
View File

@ -228,7 +228,7 @@ class calendar_merge extends bo_merge
} }
$days[date('Ymd',$_date)][$dow][] = $this->calendar_replacements($event); $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( $date_marker = array(
'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)), '$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
'$$day/name$$' => lang(date('l', 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); $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( $date_marker = array(
'$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)), '$$day/date$$' => date($GLOBALS['egw_info']['user']['preferences']['common']['dateformat'], strtotime($day)),
'$$day/name$$' => lang(date('l', strtotime($day))) '$$day/name$$' => lang(date('l', strtotime($day)))