-
- {% include 'twitter.html' %}
-
- {% include 'article_infos.html' %}
- {{ article.content }}
-
- {% if DISQUS_SITENAME %}
-
- {% endif %}
+{% block title %}{{ article.title|striptags }}{% endblock %}
+{% block content %}
+
+
+
+
+ {% include 'twitter.html' %}
+
-
+
+ {% include 'article_infos.html' %}
+ {{ article.content }}
+
+ {% if DISQUS_SITENAME %}
+
+ {% endif %}
+
+
{% endblock %}
diff --git a/pelican/themes/simple/templates/article.html b/pelican/themes/simple/templates/article.html
index d6c96a13..16c34266 100644
--- a/pelican/themes/simple/templates/article.html
+++ b/pelican/themes/simple/templates/article.html
@@ -1,19 +1,23 @@
{% extends "base.html" %}
-{% block content %}
-
-
-
-
- {{ article.content }}
-
+{% block content %}
+
+
+
+
+ {{ article.content }}
+
{% endblock %}
diff --git a/pelican/utils.py b/pelican/utils.py
index 18730e6c..d4e34842 100644
--- a/pelican/utils.py
+++ b/pelican/utils.py
@@ -8,6 +8,7 @@ import logging
from codecs import open as _open
from datetime import datetime
from itertools import groupby
+from jinja2 import Markup
from operator import attrgetter
logger = logging.getLogger(__name__)
@@ -44,6 +45,7 @@ def slugify(value):
Took from django sources.
"""
+ value = Markup(value).striptags()
if type(value) == unicode:
import unicodedata
value = unicodedata.normalize('NFKD', value).encode('ascii', 'ignore')
diff --git a/pelican/writers.py b/pelican/writers.py
index 593879e2..75971ee9 100644
--- a/pelican/writers.py
+++ b/pelican/writers.py
@@ -8,8 +8,8 @@ import logging
from codecs import open
from functools import partial
-
from feedgenerator import Atom1Feed, Rss201rev2Feed
+from jinja2 import Markup
from pelican.paginator import Paginator
from pelican.utils import get_relative_path, set_date_tzinfo
@@ -25,8 +25,9 @@ class Writer(object):
def _create_new_feed(self, feed_type, context):
feed_class = Rss201rev2Feed if feed_type == 'rss' else Atom1Feed
+ sitename = Markup(context['SITENAME']).striptags()
feed = feed_class(
- title=context['SITENAME'],
+ title=sitename,
link=(self.site_url + '/'),
feed_url=self.feed_url,
description=context.get('SITESUBTITLE', ''))
@@ -34,8 +35,9 @@ class Writer(object):
def _add_item_to_the_feed(self, feed, item):
+ title = Markup(item.title).striptags()
feed.add_item(
- title=item.title,
+ title=title,
link='%s/%s' % (self.site_url, item.url),
unique_id='tag:%s,%s:%s' % (self.site_url.replace('http://', ''),
item.date.date(), item.url),
Comments !
- - -