From: Joey Hess <joey@kitenet.net>
Date: Tue, 15 Jun 2010 21:41:26 +0000 (-0400)
Subject: fix other cases of unicode mixing issue
X-Git-Tag: 3.20100623~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a2989598884807ace2a9efd248b7c32824cf6c6f;p=ikiwiki.git

fix other cases of unicode mixing issue

and fix underlaydir override attack guard when srcdir is non-absolute
---

a2989598884807ace2a9efd248b7c32824cf6c6f
diff --cc IkiWiki/Render.pm
index 0e7aa9a48,f81e373b7..740bb52b0
--- a/IkiWiki/Render.pm
+++ b/IkiWiki/Render.pm
@@@ -295,8 -300,9 +300,8 @@@ sub find_src_files () 
  	my ($page, $underlay);
  	my $helper=sub {
  		my $file=decode_utf8($_);
 -
  		return if -l $file || -d _;
- 		$file=~s/^\Q.\/\E//;
+ 		$file=~s/^\.\///;
  		return if ! length $file;
  		$page = pagename($file);
  		if (! exists $pagesources{$page} &&