From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 31 Jul 2006 00:59:54 +0000 (+0000)
Subject: fix
X-Git-Tag: 1.13~13
X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/commitdiff_plain/953ffa1fe31ab97caf3b1bcc5840e62728620833

fix
---

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index 98e534366..14461059d 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -254,14 +254,15 @@ sub add_page (@) { #{{{
 
 		# assign it an unused page
 		my $page=IkiWiki::titlepage($params{title});
-		$page=~s!([/])!"__".ord($1)."__"!eg; # escape slashes in title
+		# escape slashes and periods in title so it doesn't specify
+		# directory name or trigger ".." disallowing code.
+		$page=~s!([/.])!"__".ord($1)."__"!eg;
 		$page=$feed->{dir}."/".$page;
 		$page=lc($page);
 		($page)=$page=~/$IkiWiki::config{wiki_file_regexp}/;
 		if (! defined $page || ! length $page) {
 			$page=$feed->{dir}."/item";
 		}
-		$page=~s/\.\.//g; # avoid ".." directory tricks
 		my $c="";
 		while (exists $IkiWiki::pagesources{$page.$c} ||
 		       -e pagefile($page.$c)) {