Photos
Blog
Projects
vanrenterghem.biz
projects
/
git.ikiwiki.info.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
release candidate
[git.ikiwiki.info.git]
/
IkiWiki
/
Plugin
/
aggregate.pm
diff --git
a/IkiWiki/Plugin/aggregate.pm
b/IkiWiki/Plugin/aggregate.pm
index 28c445913f436e8ee7269fb1b3eea6ca35351bab..fbf88c62738d783c210d27cf6aa57c1b81c71fef 100644
(file)
--- a/
IkiWiki/Plugin/aggregate.pm
+++ b/
IkiWiki/Plugin/aggregate.pm
@@
-553,7
+553,9
@@
sub aggregate (@) {
};
}
if ($@) {
};
}
if ($@) {
- $feed->{message}=gettext("feed crashed XML::Feed!")." ($@)";
+ # gettext can clobber $@
+ my $error = $@;
+ $feed->{message}=gettext("feed crashed XML::Feed!")." ($error)";
$feed->{error}=1;
debug($feed->{message});
next;
$feed->{error}=1;
debug($feed->{message});
next;
@@
-675,7
+677,9
@@
sub write_page ($$$$$) {
$template=template($feed->{template}, blind_cache => 1);
};
if ($@) {
$template=template($feed->{template}, blind_cache => 1);
};
if ($@) {
- print STDERR gettext("failed to process template:")." $@";
+ # gettext can clobber $@
+ my $error = $@;
+ print STDERR gettext("failed to process template:")." $error";
return;
}
$template->param(title => $params{title})
return;
}
$template->param(title => $params{title})