Backup_Repos/calibre
1
0
Fork 0
mirror of git://github.com/kovidgoyal/calibre.git synced 2026-05-04 08:33:07 +02:00
Code Issues Projects Releases Wiki Activity

Fix non XML safe characters in feed descriptions causing news download to fail. Fixes #1707545 [News Resource download not working..National Review Online](https://bugs.launchpad.net/calibre/+bug/1707545)

Browse source
This commit is contained in:
Kovid Goyal 2017-07-31 19:57:00 +05:30
parent 790b8273a7
commit bf5867e380
No known key found for this signature in database
GPG key ID: 06BC317B515ACE7C
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/calibre/web/feeds/templates.py
View file

@ -164,7 +164,7 @@ def _generate(self, f, feeds, cutoff, extra_css=None, style=None):
),
CLASS('calibre_feed_image')))
if getattr(feed, 'description', None):
d = DIV(feed.description, CLASS('calibre_feed_description',
d = DIV(clean_xml_chars(feed.description), CLASS('calibre_feed_description',
'calibre_rescale_80'))
d.append(BR())
div.append(d)
@ -284,6 +284,7 @@ def _generate(self, title, masthead, datefmt, feeds, extra_css=None, style=None)
class TouchscreenFeedTemplate(Template):
def _generate(self, f, feeds, cutoff, extra_css=None, style=None):
from calibre.utils.cleantext import clean_xml_chars
def trim_title(title,clip=18):
if len(title)>clip:
@ -353,7 +354,7 @@ def trim_title(title,clip=18):
),
CLASS('calibre_feed_image')))
if getattr(feed, 'description', None):
d = DIV(feed.description, CLASS('calibre_feed_description',
d = DIV(clean_xml_chars(feed.description), CLASS('calibre_feed_description',
'calibre_rescale_80'))
d.append(BR())
div.append(d)