diff options
| author | Joey Hess <joey@kodama.kitenet.net> | 2008-02-20 16:45:02 -0500 |
|---|---|---|
| committer | Joey Hess <joey@kodama.kitenet.net> | 2008-02-20 16:45:02 -0500 |
| commit | a59af82bb85a037814d3f95d3c9841048b221ca0 (patch) | |
| tree | 132a15eaafabc5f6c916600c28259b3918da47f6 | |
| parent | a4697df3e79780f472eee75681d208d7013cbb33 (diff) | |
| download | ikiwiki-a59af82bb85a037814d3f95d3c9841048b221ca0.tar ikiwiki-a59af82bb85a037814d3f95d3c9841048b221ca0.tar.gz | |
* 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.
| -rw-r--r-- | IkiWiki/Rcs/bzr.pm | 3 | ||||
| -rw-r--r-- | IkiWiki/Rcs/mercurial.pm | 3 | ||||
| -rw-r--r-- | IkiWiki/Rcs/tla.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 3 |
4 files changed, 4 insertions, 7 deletions
diff --git a/IkiWiki/Rcs/bzr.pm b/IkiWiki/Rcs/bzr.pm index a04bfe1cb..526036bf3 100644 --- a/IkiWiki/Rcs/bzr.pm +++ b/IkiWiki/Rcs/bzr.pm @@ -92,9 +92,6 @@ sub rcs_add ($) { # {{{ 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 |"); diff --git a/IkiWiki/Rcs/mercurial.pm b/IkiWiki/Rcs/mercurial.pm index db6a396ac..8b1f2c6a1 100644 --- a/IkiWiki/Rcs/mercurial.pm +++ b/IkiWiki/Rcs/mercurial.pm @@ -104,9 +104,6 @@ sub rcs_add ($) { # {{{ 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 |"); diff --git a/IkiWiki/Rcs/tla.pm b/IkiWiki/Rcs/tla.pm index ecc561bde..231496445 100644 --- a/IkiWiki/Rcs/tla.pm +++ b/IkiWiki/Rcs/tla.pm @@ -132,7 +132,7 @@ sub rcs_recentchanges ($) { } my @message; - push @message, { line => escapeHTML($summ) }; + push @message, { line => $summ }; my @pages; diff --git a/debian/changelog b/debian/changelog index 02de6fbbb..0736146d1 100644 --- 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. + * 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 |