* tla: Remove call to escapeHTML when constructing recentchanges message;

  the html is escaped at a different level. Closes: #466495
* bzr, mercurial: Remove unused import of escapeHTML.

diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm
index a04bfe1cbe39a41d48937b4006215b1222ff2183..526036bf36e0ce5ec6fab47cb8a46991d2ebe0b2 100644 (file)
--- a/IkiWiki/Rcs/bzr.pm
+++ b/IkiWiki/Rcs/bzr.pm
@@ -92,9 +92,6 @@ sub rcs_add ($) { # {{{
 sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 
 sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 

-       eval q{use CGI 'escapeHTML'};
-       error($@) if $@;
-

        my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 
                           $config{srcdir});
        open (my $out, "@cmdline |");
        my @cmdline = ("bzr", "log", "-v", "--show-ids", "--limit", $num, 
                           $config{srcdir});
        open (my $out, "@cmdline |");

diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm
index db6a396ac4914630a41407d0df8748641c9aeef2..8b1f2c6a1974347740e3d258dbeb9ae960112635 100644 (file)
--- a/IkiWiki/Rcs/mercurial.pm
+++ b/IkiWiki/Rcs/mercurial.pm
@@ -104,9 +104,6 @@ sub rcs_add ($) { # {{{
 sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 
 sub rcs_recentchanges ($) { #{{{
        my ($num) = @_;
 

-       eval q{use CGI 'escapeHTML'};
-       error($@) if $@;
-

        my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
                "--style", "default");
        open (my $out, "@cmdline |");
        my @cmdline = ("hg", "-R", $config{srcdir}, "log", "-v", "-l", $num,
                "--style", "default");
        open (my $out, "@cmdline |");

diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm
index ecc561bde86691489ab726eec677741f7fb6691f..23149644519a7c0f2bf173c7daa0e77bb3785587 100644 (file)
--- a/IkiWiki/Rcs/tla.pm
+++ b/IkiWiki/Rcs/tla.pm
@@ -132,7 +132,7 @@ sub rcs_recentchanges ($) {
                }
 
                my @message;
                }
 
                my @message;

-               push @message, { line => escapeHTML($summ) };
+               push @message, { line => $summ };

 
                my @pages;
 
 
                my @pages;
 

diff --git a/debian/changelog b/debian/changelog
index 02de6fbbb3d139e071bf375faea02e850b82f689..0736146d19fe914a9d27560d8260fa54919e9d56 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,9 @@ ikiwiki (2.40) UNRELEASED; urgency=low
     Instead, don't redirect and let conflict handling resolve it.
   * monotone: Add code to default mergerc file to run
     _MTN/ikiwiki-netsync-hook when a commit is merged in from the net.
     Instead, don't redirect and let conflict handling resolve it.
   * monotone: Add code to default mergerc file to run
     _MTN/ikiwiki-netsync-hook when a commit is merged in from the net.

+  * tla: Remove call to escapeHTML when constructing recentchanges message;
+    the html is escaped at a different level. Closes: #466495
+  * bzr, mercurial: Remove unused import of escapeHTML.

 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800
 
 
  -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 13:18:58 -0800