Author: snoopdave
Date: Mon Feb 11 12:10:07 2008
New Revision: 620600
URL: http://svn.apache.org/viewvc?rev=620600&view=rev
Log:
Merging fixes from trunk
Modified:
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/velocity/feeds.vm
Modified:
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java?rev=620600&r1=620599&r2=620600&view=diff
==============================================================================
---
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
(original)
+++
roller/branches/roller_4.0/apps/weblogger/src/java/org/apache/roller/weblogger/ui/rendering/model/SiteModel.java
Mon Feb 11 12:10:07 2008
@@ -144,7 +144,7 @@
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(Weblog queryWeblog, int sinceDays, int
length) {
+ public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, int
sinceDays, int length) {
return getWeblogEntriesPager(queryWeblog, null, null, sinceDays,
length);
}
@@ -156,7 +156,7 @@
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(Weblog queryWeblog, User user, int
sinceDays, int length) {
+ public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, User user,
int sinceDays, int length) {
return getWeblogEntriesPager(queryWeblog, user, null, sinceDays,
length);
}
@@ -169,7 +169,7 @@
* @param sinceDays Limit to past X days in past (or -1 for no limit)
* @param length Max number of results to return
*/
- public Pager getWeblogEntriesPager(Weblog queryWeblog, User user, String
cat, int sinceDays, int length) {
+ public Pager getWeblogEntriesPager(WeblogWrapper queryWeblog, User user,
String cat, int sinceDays, int length) {
String pagerUrl = null;
if (feedRequest != null) {
@@ -185,7 +185,7 @@
return new WeblogEntriesListPager(
urlStrategy,
- pagerUrl, queryWeblog, user, cat,
+ pagerUrl, queryWeblog.getPojo(), user, cat,
tags,
weblogRequest.getLocale(),
sinceDays,
Modified:
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp?rev=620600&r1=620599&r2=620600&view=diff
==============================================================================
---
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
(original)
+++
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/jsps/admin/PlanetGroups.jsp
Mon Feb 11 12:10:07 2008
@@ -60,7 +60,7 @@
</s:url>
<input type="button"
value='<s:text name="planetGroups.button.delete" />'
- onclick="window.location='<s:url value="%{deleteUrl}"/>'" />
+ onclick="window.location='<s:property
value="%{deleteUrl}"/>'" />
</s:if>
</div>
Modified:
roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/velocity/feeds.vm
URL:
http://svn.apache.org/viewvc/roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/velocity/feeds.vm?rev=620600&r1=620599&r2=620600&view=diff
==============================================================================
--- roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/velocity/feeds.vm
(original)
+++ roller/branches/roller_4.0/apps/weblogger/web/WEB-INF/velocity/feeds.vm Mon
Feb 11 12:10:07 2008
@@ -48,7 +48,7 @@
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
#if( $mc_url && $mc_length && $mc_type )
- <link rel="enclosure" type="$mc_type" length="$mc_length"
href="$mc_url"/>
+ <link rel="enclosure" type="$mc_type" length="$mc_length"
href="$utils.escapeXML($mc_url)"/>
#set($mc_url = false) #set($mc_type = false) #set($mc_length = false)#end
</entry>
#end
@@ -76,7 +76,7 @@
#set( $mc_type = $entry.findEntryAttribute("att_mediacast_type") )
#set( $mc_length = $entry.findEntryAttribute("att_mediacast_length") )
#if( $mc_url && $mc_length && $mc_type )
- <enclosure url="$mc_url" type="$mc_type" length="$mc_length" />
+ <enclosure url="$utils.escapeXML($mc_url)" type="$mc_type"
length="$mc_length" />
#set($mc_url = false) #set($mc_type = false) #set($mc_length = false)
#end
#if( $website.allowComments )
