X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/8d9f0f1b6f7607545370131c60738e37c3fd4d6f..1a5d9a134e88915b5db447924f532fd63aaeb45e:/apps/catalogue/models.py

diff --git a/apps/catalogue/models.py b/apps/catalogue/models.py
index 4dde4e0d8..58025fabd 100644
--- a/apps/catalogue/models.py
+++ b/apps/catalogue/models.py
@@ -119,7 +119,7 @@ class Book(models.Model):
             return mark_safe(self._short_html)
         else:
             tags = self.tags.filter(~Q(category__in=('set', 'theme', 'book')))
-            tags = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) for tag in tags]
+            tags = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) for tag in tags]
 
             formats = []
             if self.html_file:
@@ -135,6 +135,8 @@ class Book(models.Model):
             if self.ogg_file:
                 formats.append(u'<a href="%s">OGG</a>' % self.ogg_file.url)
             
+            formats = [mark_safe(format) for format in formats]
+            
             self._short_html = unicode(render_to_string('catalogue/book_short.html',
                 {'book': self, 'tags': tags, 'formats': formats}))
             self.save()
@@ -312,7 +314,7 @@ class Fragment(models.Model):
         if len(self._short_html):
             return mark_safe(self._short_html)
         else:
-            book_authors = [u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name) 
+            book_authors = [mark_safe(u'<a href="%s">%s</a>' % (tag.get_absolute_url(), tag.name)) 
                 for tag in self.book.tags if tag.category == 'author']
             
             self._short_html = unicode(render_to_string('catalogue/fragment_short.html',