move html escaping

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index a156f0b4e9d0e2796bc3602746c3acc194187e73..dc8b6b9fecea22bd182f47031c4c6bd05690a00b 100644 (file)
--- a/IkiWiki/Rcs/git.pm
+++ b/IkiWiki/Rcs/git.pm
@@ -343,7 +343,6 @@ sub rcs_recentchanges ($) { #{{{
 
        my ($num) = @_;
 
-       eval q{use CGI 'escapeHTML'};
        eval q{use Date::Parse};
 
        my ($sha1, $type, $when, $diffurl, $user, @pages, @message, @rets);
@@ -372,7 +371,7 @@ sub rcs_recentchanges ($) { #{{{
                        },
                }
 
-               push @message, { line => escapeHTML($title) };
+               push @message, { line => $title };
 
                if (defined $message[0] &&
                    $message[0]->{line} =~ m/$web_commit_msg/) {

diff --git a/IkiWiki/Rcs/svn.pm b/IkiWiki/Rcs/svn.pm
index e4fe2807da534cb36035e0184a47395e285f542a..2bc30206bfd5275a4fc9f715aadef91594b312c3 100644 (file)
--- a/IkiWiki/Rcs/svn.pm
+++ b/IkiWiki/Rcs/svn.pm
@@ -123,7 +123,6 @@ sub rcs_recentchanges ($) { #{{{
        
        return unless -d "$config{srcdir}/.svn";
 
-       eval q{use CGI 'escapeHTML'};
        eval q{use Date::Parse};
        eval q{use Time::Duration};
        eval q{use XML::SAX};
@@ -156,7 +155,7 @@ sub rcs_recentchanges ($) { #{{{
                my $when=time - str2time($logentry->{date}, 'UTC');
 
                foreach my $msgline (split(/\n/, $logentry->{msg})) {
-                       push @message, { line => escapeHTML($msgline) };
+                       push @message, { line => $msgline };
                }
 
                my $committype="web";

diff --git a/debian/changelog b/debian/changelog
index 4e085b6bedfb9d8e3de961d0f9fecf163e8dec9c..a01f6c6f6e5253af01322cef89434ee56ec44415 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,7 +5,7 @@ ikiwiki (1.25) UNRELEASED; urgency=low
   * Drop real uid/gid in the suid wrapper, thus allowing commits to remote
     subversion repos and fixing some other issues.
 
- -- Joey Hess <joeyh@debian.org>  Sun,  3 Sep 2006 23:28:37 -0400
+ -- Joey Hess <joeyh@debian.org>  Mon,  4 Sep 2006 00:19:50 -0400
 
 ikiwiki (1.24) unstable; urgency=low
 

diff --git a/templates/recentchanges.tmpl b/templates/recentchanges.tmpl
index dd061a06a88b987591f6f7487e4539abb7b1ee4c..726e52f6492051e6c7092fa8942c25982c2fd540 100644 (file)
--- a/templates/recentchanges.tmpl
+++ b/templates/recentchanges.tmpl
@@ -50,7 +50,7 @@
                <td class="changelog" colspan="4">
                        <TMPL_LOOP NAME="MESSAGE">
                                <TMPL_IF NAME="LINE">
-                                       <TMPL_VAR NAME="LINE"><br />
+                                       <TMPL_VAR NAME="LINE" ESCAPE="HTML"><br />
                                </TMPL_IF>
                        </TMPL_LOOP>
                </td>