You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@roller.apache.org by sn...@apache.org on 2006/11/21 16:52:06 UTC

svn commit: r477714 - /incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java

Author: snoopdave
Date: Tue Nov 21 07:52:05 2006
New Revision: 477714

URL: http://svn.apache.org/viewvc?view=rev&rev=477714
Log:
ROL-840: Calendar should not show future posts

Modified:
    incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java

Modified: incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java?view=diff&rev=477714&r1=477713&r2=477714
==============================================================================
--- incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java (original)
+++ incubator/roller/trunk/src/org/apache/roller/ui/core/tags/calendar/WeblogCalendarModel.java Tue Nov 21 07:52:05 2006
@@ -111,6 +111,10 @@
         cal.set(Calendar.MILLISECOND, cal.getMaximum(Calendar.MILLISECOND));
         Date endDate = cal.getTime();
         
+        // Fix for ROL-840 Don't include future entries
+        Date now = new Date();
+        if (endDate.after(now)) endDate = now;
+        
         loadWeblogEntries(startDate, endDate, cat);
     }