Merge branch 'master' into pedigree

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

diff --git a/IkiWiki.pm b/IkiWiki.pm
index f1a5f8058ec551667027e1af755848f7c11655aa..80e31711062694fb9494306e5900df4ca54f8b2f 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -189,11 +189,6 @@ sub loadplugin ($) { #{{{
 sub error ($;$) { #{{{
        my $message=shift;
        my $cleaner=shift;
 sub error ($;$) { #{{{
        my $message=shift;
        my $cleaner=shift;

-       if ($config{cgi}) {
-               print "Content-type: text/html\n\n";
-               print misctemplate(gettext("Error"),
-                       "<p>".gettext("Error").": $message</p>");
-       }

        log_message('err' => $message) if $config{syslog};
        if (defined $cleaner) {
                $cleaner->();
        log_message('err' => $message) if $config{syslog};
        if (defined $cleaner) {
                $cleaner->();


@@ -773,21 +768,30 @@ sub preprocess ($$$;$$) { #{{{
                        }
                        my $ret;
                        if (! $scan) {
                        }
                        my $ret;
                        if (! $scan) {

-                               $ret=$hooks{preprocess}{$command}{call}->(
-                                       @params,
-                                       page => $page,
-                                       destpage => $destpage,
-                                       preview => $preprocess_preview,
-                               );
+                               $ret=eval {
+                                       $hooks{preprocess}{$command}{call}->(
+                                               @params,
+                                               page => $page,
+                                               destpage => $destpage,
+                                               preview => $preprocess_preview,
+                                       );
+                               };
+                               if ($@) {
+                                       chomp $@;
+                                       $ret="[[!$command <span class=\"error\">".
+                                               gettext("Error").": $@"."</span>]]";
+                               }

                        }
                        else {
                                # use void context during scan pass
                        }
                        else {
                                # use void context during scan pass

-                               $hooks{preprocess}{$command}{call}->(
-                                       @params,
-                                       page => $page,
-                                       destpage => $destpage,
-                                       preview => $preprocess_preview,
-                               );
+                               eval {
+                                       $hooks{preprocess}{$command}{call}->(
+                                               @params,
+                                               page => $page,
+                                               destpage => $destpage,
+                                               preview => $preprocess_preview,
+                                       );
+                               };

                                $ret="";
                        }
                        $preprocessing{$page}--;
                                $ret="";
                        }
                        $preprocessing{$page}--;