Merge pull request #60 from rafalp/develop

Moar bugfixes from develop branch

misago/models/forummodel.py

@@ -117,9 +117,9 @@ class ForumManager(TreeManager):
         readable = []
         for pk, forum in self.forums_tree.items():
             if ((include_special or not forum.special) and 
-                    acl.forums.can_browse(pk) and
-                    acl.threads.acl[pk]['can_read_threads']):
-                readable.append(pk)
+                    acl.forums.can_browse(forum.pk) and
+                    acl.threads.acl[forum.pk]['can_read_threads']):
+                readable.append(forum.pk)
         return readable
 
 

misago/templatetags/markdown.py → misago/templatetags/md.py

@@ -1,4 +1,4 @@
-import markdown
+from markdown import markdown
 from coffin.template import Library
 from django.conf import settings
 import misago.markdown
@@ -10,7 +10,7 @@ register = Library()
 def parse_markdown(value, format=None):
     if not format:
         format = settings.OUTPUT_FORMAT
-    return markdown.markdown(value, safe_mode='escape', output_format=format).strip()
+    return markdown(value, safe_mode='escape', output_format=format).strip()
 
 
 @register.filter(name='markdown_short')