From 18dded158c9e40fbdcb0d0fb43bcaaefbce49cf8 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Wed, 26 May 2004 10:16:46 +0000 Subject: [PATCH] 1) using the color set by preferences dialogs, now in data-column 2) reverted alpes tab to space and dos-line-ends conversation --- calendar/inc/class.uicalendar.inc.php | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/calendar/inc/class.uicalendar.inc.php b/calendar/inc/class.uicalendar.inc.php index 21b7630c95..e544b55477 100755 --- a/calendar/inc/class.uicalendar.inc.php +++ b/calendar/inc/class.uicalendar.inc.php @@ -3015,15 +3015,15 @@ $id_array[0] = $ids; } } - @reset($id_array); $ret_val = Array(); - while(list($index,$id) = each($id_array)) + foreach($id_array as $id) { if (!isset($cats[$id])) { - $cat_arr = $this->cat->return_single( $id ); - $cats[$id] = $cat_arr[0]; - $cats[$id]['color'] = strstr($cats[$id]['description'],'#'); + list($cat) = $this->cat->return_single( $id ); + $cat['data'] = unserialize($cat['data']); + $cat['color'] = $cat['data']['color'] ? $cat['data']['color'] : strstr($cat['description'],'#'); + $cats[$id] = $cat; } $ret_val[] = $cats[$id]; }