comments: remove allowhtml option, just switch it on all the time
authorSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Tue, 18 Nov 2008 10:44:34 +0000 (10:44 +0000)
committerSimon McVittie <smcv@ http://smcv.pseudorandom.co.uk/>
Thu, 11 Dec 2008 21:14:03 +0000 (21:14 +0000)
Now that posts are individually sanitized, that should be safe.

IkiWiki/Plugin/comments.pm
templates/comments_form.tmpl

index 8122f9d51e1f1d848c79fecaabbae4b86c754204..f10400db1df4a1bdc5cedce5431d27a223c8c016 100644 (file)
@@ -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.
index fbf49be345c394b48fd4296c48e52533e61c26db..59c03b4f065943fed7d6fc10203272d99b4317fc 100644 (file)
@@ -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">