Commit 4c3d5576 by benjaoming

Merge pull request #293 from clincher/patch-1

Update markdown_extensions.py
parents ba21cc06 e5fbd6b5
...@@ -5,6 +5,7 @@ import re ...@@ -5,6 +5,7 @@ import re
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.template.context import Context from django.template.context import Context
from django.template.loader import render_to_string from django.template.loader import render_to_string
from django.contrib.auth.models import AnonymousUser
from wiki.core.permissions import can_read from wiki.core.permissions import can_read
ATTACHMENT_RE = re.compile(r'(?P<before>.*)(\[attachment\:(?P<id>\d+)\])(?P<after>.*)', re.IGNORECASE) ATTACHMENT_RE = re.compile(r'(?P<before>.*)(\[attachment\:(?P<id>\d+)\])(?P<after>.*)', re.IGNORECASE)
...@@ -42,8 +43,12 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor): ...@@ -42,8 +43,12 @@ class AttachmentPreprocessor(markdown.preprocessors.Preprocessor):
# I.e. do not insert attachments in other articles that # I.e. do not insert attachments in other articles that
# the original uploader cannot read, that would be out # the original uploader cannot read, that would be out
# of scope! # of scope!
attachment_can_read = can_read( self.markdown.article, article_owner = attachment.article.owner
attachment.article.owner) if not article_owner:
article_owner = AnonymousUser()
attachment_can_read = can_read(
self.markdown.article, article_owner)
html = render_to_string( html = render_to_string(
"wiki/plugins/attachments/render.html", "wiki/plugins/attachments/render.html",
Context({ Context({
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment