diff -r f87561822e27 -r 8260e857822b web/views/xmlrss.py --- a/web/views/xmlrss.py Thu Apr 30 00:37:10 2009 +0200 +++ b/web/views/xmlrss.py Thu Apr 30 00:39:09 2009 +0200 @@ -155,11 +155,11 @@ self.w(u'\n' % req.encoding) self.w(u'\n') self.w(u' \n') - self.w(u' %s RSS Feed\n' % html_escape(self.page_title())) - self.w(u' %s\n' % html_escape(req.form.get('vtitle', ''))) + self.w(u' %s RSS Feed\n' % xml_escape(self.page_title())) + self.w(u' %s\n' % xml_escape(req.form.get('vtitle', ''))) params = req.form.copy() params.pop('vid', None) - self.w(u' %s\n' % html_escape(self.build_url(**params))) + self.w(u' %s\n' % xml_escape(self.build_url(**params))) def _close(self): self.w(u' \n') @@ -175,6 +175,7 @@ def cell_call(self, row, col): self.wview('rssitem', self.rset, row=row, col=col) + class RssItemView(EntityView): id = 'rssitem' date_format = '%%Y-%%m-%%dT%%H:%%M%+03i:00' % (timezone / 3600) @@ -183,9 +184,9 @@ def cell_call(self, row, col): entity = self.complete_entity(row, col) self.w(u'\n') - self.w(u'%s\n' % html_escape(entity.absolute_url())) + self.w(u'%s\n' % xml_escape(entity.absolute_url())) self.render_title_link(entity) - self._marker('description', html_escape(entity.dc_description())) + self._marker('description', xml_escape(entity.dc_description())) self._marker('dc:date', entity.dc_date(self.date_format)) self.render_entity_creator(entity) self.w(u'\n') @@ -201,4 +202,4 @@ def _marker(self, marker, value): if value: - self.w(u' <%s>%s\n' % (marker, html_escape(value), marker)) + self.w(u' <%s>%s\n' % (marker, xml_escape(value), marker))