From 15269fed646bf14692061e634969c98b614daaad Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kodama.kitenet.net>
Date: Tue, 18 Nov 2008 02:43:17 -0500
Subject: improve escaping of wikilinks and preprocessor directives

The old method failed for '[' x 3.
---
 IkiWiki/Plugin/aggregate.pm | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'IkiWiki/Plugin/aggregate.pm')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index f256b3ac1..6cdbbc0e9 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -610,7 +610,7 @@ sub add_page (@) { #{{{
 	my $template=template($feed->{template}, blind_cache => 1);
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
-	$template->param(content => htmlescape(htmlabs($params{content},
+	$template->param(content => wikiescape(htmlabs($params{content},
 		defined $params{base} ? $params{base} : $feed->{feedurl})));
 	$template->param(name => $feed->{name});
 	$template->param(url => $feed->{url});
@@ -637,11 +637,9 @@ sub add_page (@) { #{{{
 	}
 } #}}}
 
-sub htmlescape ($) { #{{{
+sub wikiescape ($) { #{{{
 	# escape accidental wikilinks and preprocessor stuff
-	my $html=shift;
-	$html=~s/(?<!\\)\[\[/\\\[\[/g;
-	return $html;
+	return encode_entities(shift, '\[\]');
 } #}}}
 
 sub urlabs ($$) { #{{{
-- 
cgit v1.2.3