Author: snoopdave
Date: Mon Mar 27 13:25:19 2006
New Revision: 389281
URL: http://svn.apache.org/viewcvs?rev=389281&view=rev
Log:
Fix for escaped HTML in feed titles problem ROL-1097
Modified:
incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm
incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm
Modified: incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm?rev=389281&r1=389280&r2=389281&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/atom.vm Mon Mar 27
13:25:19 2006
@@ -1,7 +1,7 @@
$pageHelper.setContentType("application/atom+xml;charset=utf-8")<?xml
version="1.0" encoding='utf-8'?>
<feed xmlns="http://www.w3.org/2005/Atom";>
- <title>$utilities.textToHTML($website.name,true)</title>
- <subtitle>$utilities.textToHTML($website.description,true)</subtitle>
+ <title type="html">$utilities.textToHTML($website.name,true)</title>
+ <subtitle
type="html">$utilities.textToHTML($website.description,true)</subtitle>
#if( $catPath && $catPath.length() > 0)
#set( $postfix = "?catname=$catPath" )
#else
@@ -29,7 +29,7 @@
#set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount,
'nil') )
#foreach( $entry in $entries )
<entry>
- <title>$utilities.textToHTML($entry.title,true)</title>
+ <title type="html">$utilities.textToHTML($entry.title,true)</title>
<id>$absBaseURL$entry.permaLink</id>
<link rel="alternate" type="text/html"
href="$absBaseURL$entry.permaLink"/>
<published>$utilities.formatIso8601Date($entry.pubTime)</published>
Modified: incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm
URL:
http://svn.apache.org/viewcvs/incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm?rev=389281&r1=389280&r2=389281&view=diff
==============================================================================
--- incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm (original)
+++ incubator/roller/trunk/web/WEB-INF/classes/flavors/rss.vm Mon Mar 27
13:25:19 2006
@@ -1,7 +1,7 @@
$pageHelper.setContentType("application/rss+xml;charset=utf-8")<?xml
version="1.0" encoding="utf-8"?>
<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/";>
<channel>
- <title>$utilities.textToHTML($website.name,true)</title>
+ <title>$utilities.removeHTML($website.name)</title>
<link>$websiteURL</link>
<description>$utilities.textToHTML($website.description,true)</description>
<language>en-us</language>
@@ -11,7 +11,7 @@
#set( $entries = $pageModel.getRecentWeblogEntriesArray($entryCount, 'nil') )
#foreach( $entry in $entries )
<item>
- <title>$utilities.textToHTML($entry.title,true)</title>
+ <title>$utilities.removeHTML($entry.title)</title>
#if( $entry.link && !$entry.link.trim().equals("") )
<source
url="$utilities.textToHTML($entry.link)">$utilities.textToHTML($entry.link)</source>
#end
