Skip to content
This repository has been archived by the owner on Sep 13, 2024. It is now read-only.

Commit

Permalink
Fix #64 - shared calendar it gives a spinning disks and never ends
Browse files Browse the repository at this point in the history
  • Loading branch information
mariuszkrzaczkowski committed Jan 9, 2015
1 parent 7e08f4f commit e46a114
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion modules/Calendar/activityTypes/MultipleEvents.php
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
* The Initial Developer of the Original Code is YetiForce. Portions created by YetiForce are Copyright (C) www.yetiforce.com.
* All Rights Reserved.
*************************************************************************************************************************************/
vimport('~~modules/Calendar/activityTypes/Events.php');
class Calendar_MultipleEvents_ActivityTypes{
public function process($feed, $request, $start, $end, &$result, $userid = false,$color = null,$textColor = 'white') {
foreach ($request->get('mapping') as $id=>$backgroundColorAndTextColor) {
$userEvents = array();
$colorComponents = explode(',',$backgroundColorAndTextColor);
Calendar_Events_ActivityTypes::process($start, $end, $userEvents ,$id, $colorComponents[0], $colorComponents[1]);
Calendar_Events_ActivityTypes::process($feed, $request, $start, $end, $userEvents ,$id, $colorComponents[0], $colorComponents[1]);
$result[$id] = $userEvents;
}
}
Expand Down

0 comments on commit e46a114

Please sign in to comment.