diff --git a/README.rst b/README.rst index 36ea746..ef831f0 100644 --- a/README.rst +++ b/README.rst @@ -13,7 +13,7 @@ might not be for you. Requirements ============ -django-markupwiki depends on django >= 1.2a, django-markupfield >= 1.0.0a2 and +django-markupwiki depends on django >= 1.2, django-markupfield >= 1.0.0b and libraries for whichever markup options you wish to include. diff --git a/example/example b/example/example deleted file mode 100644 index 51ee816..0000000 Binary files a/example/example and /dev/null differ diff --git a/markupwiki/models.py b/markupwiki/models.py index 98e71b7..f6bd195 100644 --- a/markupwiki/models.py +++ b/markupwiki/models.py @@ -77,7 +77,8 @@ class ArticleVersion(models.Model): author = models.ForeignKey(User, related_name='article_versions') number = models.PositiveIntegerField() body = MarkupField(default_markup_type=DEFAULT_MARKUP_TYPE, - markup_choices=WIKI_MARKUP_TYPES) + markup_choices=WIKI_MARKUP_TYPES, + escape_html=True) comment = models.CharField(max_length=200, blank=True) timestamp = models.DateTimeField(auto_now_add=True) diff --git a/markupwiki/views.py b/markupwiki/views.py index c1d533c..a5ca08f 100644 --- a/markupwiki/views.py +++ b/markupwiki/views.py @@ -11,7 +11,8 @@ from django.utils.functional import wraps from markupwiki.models import Article, PUBLIC, DELETED, LOCKED from markupwiki.forms import ArticleForm, StaffModerationForm, ArticleRenameForm -CREATE_MISSING_ARTICLE = getattr(settings, 'MARKUPWIKI_CREATE_MISSING_ARTICLES', True) +CREATE_MISSING_ARTICLE = getattr(settings, + 'MARKUPWIKI_CREATE_MISSING_ARTICLES', True) def title_check(view): def new_view(request, title, *args, **kwargs):