summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-11-18 10:44:34 +0000
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>2008-12-11 21:14:03 +0000
commit249ea2ed7557e34614ef9f1f863cee9489798510 (patch)
tree8aaa595cd4f33125bf05d606b9f0317d6585c706
parent4663f364bbc220bbdbf03582765b6d82f0bddc46 (diff)
comments: remove allowhtml option, just switch it on all the time
Now that posts are individually sanitized, that should be safe.
-rw-r--r--IkiWiki/Plugin/comments.pm9
-rw-r--r--templates/comments_form.tmpl2
2 files changed, 1 insertions, 10 deletions
diff --git a/IkiWiki/Plugin/comments.pm b/IkiWiki/Plugin/comments.pm
index 8122f9d51..f10400db1 100644
--- a/IkiWiki/Plugin/comments.pm
+++ b/IkiWiki/Plugin/comments.pm
@@ -48,7 +48,6 @@ sub preprocess (@) { #{{{
$pagestate{$page}{comments}{comments} = defined $params{closed}
? (not IkiWiki::yesno($params{closed}))
: 1;
- $pagestate{$page}{comments}{allowhtml} = IkiWiki::yesno($params{allowhtml});
$pagestate{$page}{comments}{allowdirectives} = IkiWiki::yesno($params{allowdirectives});
$pagestate{$page}{comments}{commit} = defined $params{commit}
? IkiWiki::yesno($params{commit})
@@ -187,7 +186,6 @@ sub sessioncgi ($$) { #{{{
}
my $allow_directives = $pagestate{$page}{comments}{allowdirectives};
- my $allow_html = $pagestate{$page}{comments}{allowdirectives};
my $commit_comments = defined $pagestate{$page}{comments}{commit}
? $pagestate{$page}{comments}{commit}
: 1;
@@ -203,7 +201,6 @@ sub sessioncgi ($$) { #{{{
htmllink($page, $page, 'ikiwiki/formatting',
noimageinline => 1,
linktext => 'FormattingHelp'),
- allowhtml => $allow_html,
allowdirectives => $allow_directives);
if (not exists $pagesources{$page}) {
@@ -243,12 +240,6 @@ sub sessioncgi ($$) { #{{{
unless $config{prefix_directives};
}
- unless ($allow_html) {
- $body =~ s/&(\w|#)/&amp;$1/g;
- $body =~ s/</&lt;/g;
- $body =~ s/>/&gt;/g;
- }
-
IkiWiki::run_hooks(sanitize => sub {
# $fake is a possible location for this comment. We don't
# know yet what the comment number *actually* is.
diff --git a/templates/comments_form.tmpl b/templates/comments_form.tmpl
index fbf49be34..59c03b4f0 100644
--- a/templates/comments_form.tmpl
+++ b/templates/comments_form.tmpl
@@ -8,7 +8,7 @@ Subject: <TMPL_VAR FIELD-SUBJECT><br />
<TMPL_VAR FIELD-BODY><br />
<TMPL_VAR FORM-SUBMIT><br />
<TMPL_VAR HELPONFORMATTINGLINK><br />
-HTML is <TMPL_UNLESS NAME="ALLOWHTML">not </TMPL_UNLESS>allowed.<br />
+Formatting with Markdown and HTML are allowed.<br />
IkiWiki directives ([[!directive]]) are <TMPL_UNLESS NAME="ALLOWDIRECTIVES">not </TMPL_UNLESS>allowed.<br />
<TMPL_VAR NAME="FORM-END">