*** /var/www/html/dakar/lib/TWiki/Plugins/CalendarPlugin.pm	2005-11-03 20:09:24.000000000 -0500
--- /home/anton/twiki/branches/DEVELOP/twikiplugins/CalendarPlugin/lib/TWiki/Plugins/CalendarPlugin.pm	2005-11-03 07:49:31.000000000 -0500
***************
*** 28,34 ****
  # =========================
  use vars qw( $web $topic $user $installWeb $VERSION $RELEASE $pluginName $debug
  	    $libsLoaded $libsError $defaultsInitialized %defaults );
! $VERSION   = '$Rev: 7288$';
  $RELEASE = 'Dakar';
  
  #$VERSION   = '1.017';  #dro# Added start and end date support for periodic repeaters; Added initlang patch by TWiki:Main.JensKloecker; Changed 'my' to 'local' so exceptions working again; Removed fetchxmap debug message; Fixed illegal date bug; Allowed month abbreviations in month attribute
--- 28,34 ----
  # =========================
  use vars qw( $web $topic $user $installWeb $VERSION $RELEASE $pluginName $debug
  	    $libsLoaded $libsError $defaultsInitialized %defaults );
! $VERSION   = '$Rev$';
  $RELEASE = 'Dakar';
  
  #$VERSION   = '1.017';  #dro# Added start and end date support for periodic repeaters; Added initlang patch by TWiki:Main.JensKloecker; Changed 'my' to 'local' so exceptions working again; Removed fetchxmap debug message; Fixed illegal date bug; Allowed month abbreviations in month attribute
***************
*** 826,835 ****
  		    $listStartDay = 1;
  		    last;
  		}
! 		my $content = $cal->getcontent($day) . CGI::br() ;
  		if ($content && ($content !~ m/^\s*$/)) {
  		    # Only display those days with events
! 		    $result .= $content ;
  		}
  		$day++;
  		$numDays--;
--- 826,842 ----
  		    $listStartDay = 1;
  		    last;
  		}
! 		my $content = $cal->getcontent($day);
  		if ($content && ($content !~ m/^\s*$/)) {
  		    # Only display those days with events
! 		    if (($cal->month == $cal->today_month())
! 			&& ($cal->year == $cal->today_year())
! 			&& ($day == $cal->today_date())) {
! 			$result .= &formatToday($cal, $day, %options);
! 		    } else {
! 			$result .= &formatDateNumber($cal, $day, %options);
! 		    }
! 		    $result .= $content;
  		}
  		$day++;
  		$numDays--;