Merge tag 'release_2014-12-08' into archweb-generic

Minor fixes and package updates

1 files changed, 3 insertions, 4 deletions

diff --git a/news/models.py b/news/models.py
index 985c1088..a66da8d4 100644
--- a/news/models.py
+++ b/news/models.py
@@ -1,11 +1,11 @@
-import markdown
-
 from django.db import models
 from django.contrib.auth.models import User
 from django.contrib.sites.models import Site
 from django.utils.safestring import mark_safe
 from django.utils.timezone import now
 
+from main.utils import parse_markdown
+
 
 class News(models.Model):
     slug = models.SlugField(max_length=255, unique=True)
@@ -22,8 +22,7 @@ class News(models.Model):
         return '/news/%s/' % self.slug
 
     def html(self):
-        return mark_safe(markdown.markdown(
-            self.content, safe_mode=self.safe_mode, enable_attributes=False))
+        return mark_safe(parse_markdown(self.content, not self.safe_mode))
 
     def __unicode__(self):
         return self.title