X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b63f1260eef70cf7eb1703ebae1244db7cef0583..2e15a490067991448c3b65323ad9ecdc774dbfe4:/IkiWiki/CGI.pm?ds=sidebyside

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index cbc2fe8eb..89f4f2d73 100644
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -58,11 +58,6 @@ sub cgitemplate ($$$;@) {
 	
 	my $template=template("page.tmpl");
 
-	my $topurl = $config{url};
-	if (defined $cgi && ! $config{w3mmode} && ! $config{reverse_proxy}) {
-		$topurl = $cgi->url;
-	}
-
 	my $page="";
 	if (exists $params{page}) {
 		$page=delete $params{page};
@@ -488,6 +483,9 @@ sub cgi (;$$) {
 sub cgierror ($) {
 	my $message=shift;
 
+	eval q{use HTML::Entities};
+	$message = encode_entities($message);
+
 	print "Content-type: text/html\n\n";
 	print cgitemplate(undef, gettext("Error"),
 		"<p class=\"error\">".gettext("Error").": $message</p>");