X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/b8dbb48fdce9ffc00d1f3f4267948ee2875d2970..2e15a490067991448c3b65323ad9ecdc774dbfe4:/IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 97fe6b8ff..fa71f4791 100644
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -843,12 +843,9 @@ sub log_message ($$) {
 			$log_open=1;
 		}
 		eval {
-			# keep a copy to avoid editing the original config repeatedly
-			my $wikiname = $config{wikiname};
-			utf8::encode($wikiname);
-			my $message = join(" ", @_);
+			my $message = "[$config{wikiname}] ".join(" ", @_);
 			utf8::encode($message);
-			Sys::Syslog::syslog($type, "[$wikiname] %s", $message);
+			Sys::Syslog::syslog($type, "%s", $message);
 		};
                 if ($@) {
                     print STDERR "failed to syslog: $@" unless $log_failed;
@@ -1650,6 +1647,8 @@ sub preprocess ($$$;$$) {
 				if ($@) {
 					my $error=$@;
 					chomp $error;
+					eval q{use HTML::Entities};
+					$error = encode_entities($error);
 				 	$ret="[[!$command <span class=\"error\">".
 						gettext("Error").": $error"."</span>]]";
 				}