diff --git a/calendar/inc/class.bocalendar.inc.php b/calendar/inc/class.bocalendar.inc.php
index e9a4ee153c..17393e2267 100755
--- a/calendar/inc/class.bocalendar.inc.php
+++ b/calendar/inc/class.bocalendar.inc.php
@@ -1564,12 +1564,13 @@
return 'private';
}
-//NDEE: cutting off too long entries 140304
-//ToDo: calculate length based on client window
- elseif(strlen($event[$field]) > 19 && !$this->printer_friendly && $field == "title")
+// cut off too long titles
+ elseif(strlen($event[$field]) > 19 && !$this->printer_friendly && $field=="title")
// elseif(strlen($event[$field]) > 19 && $this->printer_friendly)
{
- return substr($event[$field], 0 , 19) . ' ...';
+// we dont use currently 160304
+// return substr($event[$field], 0 , 19) . ' ...';
+ return $event[$field];
}
else
{
diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php
index ee6e11ed87..68990edbef 100755
--- a/calendar/inc/class.uicalendar.inc.php
+++ b/calendar/inc/class.uicalendar.inc.php
@@ -203,7 +203,8 @@
if($this->bo->printer_friendly == False)
{
- $month = '' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'';
+//NDEE $month = '' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'';
+ $month = '' . lang($GLOBALS['phpgw']->common->show_date($date['raw'],'F')).' '.$GLOBALS['phpgw']->common->show_date($date['raw'],'Y').'';
}
else
{
@@ -3610,12 +3611,11 @@
$starttime = $param['starttime'];
$endtime = $param['endtime'];
$participants = $param['participants'];
- $participants_id = array();
foreach($participants as $part => $nul)
{
$participants[$part] = $GLOBALS['phpgw']->common->grab_owner_name($part);
// Much better for processor :)
- $participants_id[] = $part;
+ $participants_id[] .= $part;
}
uasort($participants,'strnatcasecmp'); // sort them after their fullname
@@ -3642,7 +3642,7 @@
$k = ($j == 0 ? sprintf('%02d',$i).'
':'').sprintf('%02d',$j*$increment);
$str .= '