svn commit: r385585 - /incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java

[snoopdave]

Author: snoopdave
Date: Mon Mar 13 08:17:15 2006
New Revision: 385585

URL: http://svn.apache.org/viewcvs?rev=385585&view=rev
Log:
Fix for ROL-1028, main feed not obeying entry count settings

Modified:
    
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java

Modified: 
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java
URL: 
http://svn.apache.org/viewcvs/incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java?rev=385585&r1=385584&r2=385585&view=diff
==============================================================================
--- 
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java 
(original)
+++ 
incubator/roller/trunk/src/org/roller/presentation/velocity/ContextLoader.java 
Mon Mar 13 08:17:15 2006
@@ -157,6 +157,8 @@
                 ((RollerPropertyData)props.get("site.name")).getValue());
             weblog.setDescription(
                 
((RollerPropertyData)props.get("site.description")).getValue());
+            weblog.setEntryDisplayCount(
+                
RollerRuntimeConfig.getIntProperty("site.newsfeeds.defaultEntries"));
             ctx.put("handle",   weblog.getHandle() );
             ctx.put("userName", weblog.getHandle() );
             ctx.put("fullName", weblog.getHandle());
@@ -164,7 +166,7 @@
             ctx.put("timezone", TimeZone.getDefault());
             ctx.put("timeZone", TimeZone.getDefault());
             ctx.put("emailAddress",
-                ((RollerPropertyData)props.get("site.adminemail")).getValue());
+                
((RollerPropertyData)props.get("site.adminemail")).getValue());           
         }
         ctx.put("website", WebsiteDataWrapper.wrap(weblog) );