holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Calendar: fix not working tooltip (showing html tags) in year-view

Browse Source
This commit is contained in:
Ralf Becker 2015-02-03 09:42:51 +00:00
parent aaaa25e43b
commit 7c48fc0e03
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -659,6 +659,11 @@ class calendar_groupdav extends groupdav_handler
break;
}
}
if (!isset($master))
{
error_log(__METHOD__."('$uid', ...) master NOT found!");
return array();
}
foreach($events as $k => &$recurrence)
{
//error_log(__FILE__.'['.__LINE__.'] '.__METHOD__."($uid)[$k]:" . array2string($recurrence));

2
calendar/inc/class.calendar_uiviews.inc.php
View File

@ -577,7 +577,7 @@ class calendar_uiviews extends calendar_ui
$width = $this->time2pos($event['end_m'] - $event['start_m']);
$color = $data['color'] ? $data['color'] : 'gray';
$tooltip = html::htmlspecialchars($data['tooltip'], true); // true=need double-encoding, as it is transported as attribute!
$tooltip = html::htmlspecialchars($data['tooltip']);
$content .= $indent.'<div class="calendar_plannerEvent'.($data['private'] ? 'Private' : '').
'" data-tooltip ="'.$tooltip .
'" style="position: absolute; left: '.$left.'%; width: '.$width.'%; height: '.