extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-26 16:48:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add 'selected' day table for daily schedules

Browse Source
This commit is contained in:
Nathan Gray 2012-02-16 16:55:42 +00:00
parent 9a3ef9f726
commit ddd13e8620
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,6 +39,7 @@ class calendar_merge extends bo_merge
'today', 'today',
'tomorrow', 'tomorrow',
'yesterday', 'yesterday',
'selected',
); );
/** /**
@ -337,6 +338,10 @@ class calendar_merge extends bo_merge
$date = $this->bo->date2ts($date); $date = $this->bo->date2ts($date);
if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array(); if(is_array($id) && $id['start'] && ($date < $id['start'] || $date > $id['end'])) return array();
} }
elseif ($plugin == 'selected')
{
$date = $id['start'];
}
else else
{ {
$date = strtotime($plugin); $date = strtotime($plugin);