From b6075d61632adb1ec43fb5572db0521bbac9d1ac Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 4 Sep 2006 04:29:18 +0000
Subject: move html escaping

---
 IkiWiki/Rcs/git.pm           | 3 +--
 IkiWiki/Rcs/svn.pm           | 3 +--
 debian/changelog             | 2 +-
 templates/recentchanges.tmpl | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/IkiWiki/Rcs/git.pm b/IkiWiki/Rcs/git.pm
index a156f0b4e..dc8b6b9fe 100644
--- 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 e4fe2807d..2bc30206b 100644
--- 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 4e085b6be..a01f6c6f6 100644
--- 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 dd061a06a..726e52f64 100644
--- 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>
-- 
cgit v1.2.3