roller-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From snoopd...@apache.org
Subject svn commit: r776530 - /roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
Date Wed, 20 May 2009 03:29:03 GMT
Author: snoopdave
Date: Wed May 20 03:29:02 2009
New Revision: 776530

URL: http://svn.apache.org/viewvc?rev=776530&view=rev
Log:
Fix for ROL-1813 - "#showWeblogEntryCalendar() ignores category argument"
   https://issues.apache.org/jira/browse/ROL-1813

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

Modified: roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java?rev=776530&r1=776529&r2=776530&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
(original)
+++ roller/trunk/apps/weblogger/src/java/org/apache/roller/weblogger/ui/core/tags/calendar/WeblogCalendarModel.java
Wed May 20 03:29:02 2009
@@ -75,8 +75,6 @@
                   weblog.getTimeZoneInstance(), weblog.getLocaleInstance());
             locale = pageRequest.getLocale();
             
-            initDay(day);  
-            
             // Category method argument overrides category from URL
             if (catArgument != null) {
                 cat = catArgument;
@@ -84,6 +82,8 @@
                 cat = pageRequest.getWeblogCategoryName();
             }
             
+            initDay(day);
+
         } catch (Exception e) {
             // some kind of error parsing the request or looking up weblog
             log.debug("ERROR: initializing calendar", e);



Mime
View raw message