Commits

Philipp Wassibauer  committed 6161ddc

smileys fix

  • Participants
  • Parent commits b0ffb3f

Comments (0)

Files changed (3)

File djangobb_forum/models.py

         else:
             raise Exception('Invalid markup property: %s' % self.markup)
         self.body_html = urlize(self.body_html)
-        if forum_settings.SMILES_SUPPORT:
-            self.body_html = smiles(self.body_html)
         super(Post, self).save(*args, **kwargs)
 
 
         else:
             raise Exception('Invalid markup property: %s' % self.markup)
         self.body_html = urlize(self.body_html)
-        if forum_settings.SMILES_SUPPORT:
-            self.body_html = smiles(self.body_html)
         super(PrivateMessage, self).save(*args, **kwargs)
 
     @models.permalink

File djangobb_forum/util.py

     """
     Replace text smiles.
     """
-
     parser = ExcludeTagsHTMLParser(_smile_replacer)
     parser.feed(data)
     smiled_html = parser.html
     parser.close()
     return smiled_html
 
+
 def paginate(items, request, per_page, total_count=None):
     try:
         page_number = int(request.GET.get('page', 1))

File djangobb_forum/views.py

 @render_to('forum/post_preview.html')
 def post_preview(request):
     '''Preview for markitup'''
-
     markup = request.user.forum_profile.markup
     data = request.POST.get('data', '')
     if markup == 'bbcode':
         raise Exception('Invalid markup property: %s' % markup)
 
     data = urlize(data)
-    if forum_settings.SMILES_SUPPORT:
-        data = smiles(data)
     return {'data': data}