Merge branch 'master' into debian-jessie-backports

[git.ikiwiki.info.git] / IkiWiki.pm

diff --git a/IkiWiki.pm b/IkiWiki.pm
index 97fe6b8ffa035032812a8340e7b1953e06277282..fa71f479107a2388fde2fe00a67bfa2daa4fb3a9 100644 (file)
--- 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>]]";
                                }