You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by ga...@apache.org on 2005/10/24 05:38:21 UTC
svn commit: r327946 -
/incubator/roller/trunk/src/org/roller/presentation/tags/calendar/CalendarTag.java
Author: gangolli
Date: Sun Oct 23 20:37:20 2005
New Revision: 327946
URL: http://svn.apache.org/viewcvs?rev=327946&view=rev
Log:
Fix for ROL-683. Applied patch submitted by David Graff. Reviewed. Tested. Believe correct.
Modified:
incubator/roller/trunk/src/org/roller/presentation/tags/calendar/CalendarTag.java
Modified: incubator/roller/trunk/src/org/roller/presentation/tags/calendar/CalendarTag.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/tags/calendar/CalendarTag.java?rev=327946&r1=327945&r2=327946&view=diff
==============================================================================
--- incubator/roller/trunk/src/org/roller/presentation/tags/calendar/CalendarTag.java (original)
+++ incubator/roller/trunk/src/org/roller/presentation/tags/calendar/CalendarTag.java Sun Oct 23 20:37:20 2005
@@ -208,21 +208,24 @@
String url = model.computeUrl( tddate, false );
String content = model.getContent( tddate );
- if // day is today then use today style
- (( cal.get(Calendar.DAY_OF_MONTH)
- == todayCal.get(Calendar.DAY_OF_MONTH))
- && ( cal.get(Calendar.MONTH)
- == todayCal.get(Calendar.MONTH))
- && ( cal.get(Calendar.YEAR)
- == todayCal.get(Calendar.YEAR)))
- {
- printToday(pw, cal, url, content);
- }
- else if // day is in calendar month
+ if // day is in calendar month
((cal.get(Calendar.MONTH) == dayCal.get(Calendar.MONTH))
&& (cal.get(Calendar.YEAR) == dayCal.get(Calendar.YEAR)))
{
- printDayInThisMonth(pw, cal, url, content);
+ if // day is today then use today style
+ (( cal.get(Calendar.DAY_OF_MONTH)
+ == todayCal.get(Calendar.DAY_OF_MONTH))
+ && ( cal.get(Calendar.MONTH)
+ == todayCal.get(Calendar.MONTH))
+ && ( cal.get(Calendar.YEAR)
+ == todayCal.get(Calendar.YEAR)))
+ {
+ printToday(pw, cal, url, content);
+ }
+ else
+ {
+ printDayInThisMonth(pw, cal, url, content);
+ }
}
else // apply day-not-in-month style ;-)
{