X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/92065444d982a443d3862f9ce5094bd32faffb85..6206e9a62e06ca9bf55f6bc659e7229ba0b911d1:/IkiWiki/CGI.pm

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index 6e1efbd69..01c5812ef 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -77,11 +77,12 @@ sub cgi_recentchanges ($) { #{{{
 	memoize("htmllink");
 
 	eval q{use Time::Duration};
+	eval q{use CGI 'escapeHTML'};
 
 	my $changelog=[rcs_recentchanges(100)];
 	foreach my $change (@$changelog) {
 		$change->{when} = concise(ago($change->{when}));
-		$change->{user} = htmllink("", "", $change->{user}, 1);
+		$change->{user} = htmllink("", "", escapeHTML($change->{user}), 1);
 		$change->{pages} = [
 			map {
 				$_->{link} = htmllink("", "", $_->{page}, 1);
@@ -430,7 +431,6 @@ sub cgi_editpage ($$) { #{{{
 		return;
 	}
 	elsif ($form->submitted eq "Preview") {
-		require IkiWiki::Render;
 		my $content=$form->field('editcontent');
 		my $comments=$form->field('comments');
 		$form->field(name => "editcontent",
@@ -614,7 +614,7 @@ sub cgi () { #{{{
 		cgi_hyperestraier();
 	}
 	
-	CGI::Session->name("ikiwiki_session_$config{wikiname}");
+	CGI::Session->name("ikiwiki_session_".encode_utf8($config{wikiname}));
 	
 	my $oldmask=umask(077);
 	my $session = CGI::Session->new("driver:DB_File", $q,