.../contrib/calendar/theme/calendar-week.tpl.php   |    5 +++--
 sites/all/modules/contrib/calendar/theme/theme.inc |    6 +-----
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/sites/all/modules/contrib/calendar/theme/calendar-week.tpl.php b/sites/all/modules/contrib/calendar/theme/calendar-week.tpl.php
index ad6f566..4b639ec 100644
--- a/sites/all/modules/contrib/calendar/theme/calendar-week.tpl.php
+++ b/sites/all/modules/contrib/calendar/theme/calendar-week.tpl.php
@@ -67,10 +67,11 @@ foreach ($day_names as $key => $value) {
       <?php for($j = 0; $j < 7; $j++): ?>
         <?php $cell = (empty($all_day[$j][$i])) ? NULL : $all_day[$j][$i]; ?>
         <?php if($cell != NULL && $cell['filled'] && $cell['wday'] == $j): ?>
+          <?php $css_class = empty($cell['item']->is_multi_day) ? 'single-day' : 'multi-day' ?>
           <?php for($k = $colpos; $k < $cell['wday']; $k++) : ?>
-          <td class="multi-day no-entry"><div class="inner">&nbsp;</div></td>
+          <td class="<?php echo $css_class ?> no-entry"><div class="inner">&nbsp;</div></td>
           <?php endfor;?>
-          <td colspan="<?php print $cell['colspan']?>" class="multi-day">
+          <td colspan="<?php print $cell['colspan']?>" class="<?php echo $css_class ?>">
             <div class="inner">
             <?php print $cell['entry']?>
             </div>
diff --git a/sites/all/modules/contrib/calendar/theme/theme.inc b/sites/all/modules/contrib/calendar/theme/theme.inc
index 10579b2..5fe4406 100644
--- a/sites/all/modules/contrib/calendar/theme/theme.inc
+++ b/sites/all/modules/contrib/calendar/theme/theme.inc
@@ -392,18 +392,14 @@ function template_preprocess_calendar_week(&$vars) {
 
   // If we're not grouping by time, move all items into the 'all day' array.
   if (empty($view->date_info->style_groupby_times)) {
-    $add_row = FALSE;
     foreach ($vars['all_day'] as $index => &$day ) {
       foreach ($rows['singleday_buckets'][$index] as $item) {
         foreach ($item as $event) {
           $day[] = $event;
-          $add_row = TRUE;
+          $vars['multiday_rows']++;
         }
       }
     }
-    if ( $add_row ) {
-      $vars['multiday_rows']++;
-    }
   }
   else {
     foreach ($rows['singleday_buckets'] as $wday => $singleday_row) {