From 75d94355a0761a83df86ef40e05de2ba2d2f2721 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 29 Aug 2008 18:43:48 -0400 Subject: [PATCH] Work around perl $_ scoping nonsense that caused breakage when loading external plugins. (There's a good chance this bug doesn't affect this version of the code, since while $config{plugin} is clobbered, it's not used further.) --- IkiWiki.pm | 4 +++- debian/changelog | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/IkiWiki.pm b/IkiWiki.pm index a4657a311..ff82e3961 100644 --- a/IkiWiki.pm +++ b/IkiWiki.pm @@ -151,7 +151,9 @@ sub loadplugins () { #{{{ unshift @INC, possibly_foolish_untaint($config{libdir}); } - loadplugin($_) foreach @{$config{plugin}}; + foreach my $plugin (@{$config{plugin}}) { + loadplugin($plugin); + } run_hooks(getopt => sub { shift->() }); if (grep /^-/, @ARGV) { diff --git a/debian/changelog b/debian/changelog index 9b62fcb29..1b892da40 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,6 +24,8 @@ ikiwiki (2.53.1) UNRELEASED; urgency=low * edittemplate: Don't wipe out edits on preview. * map: The fix for #449285 was buggy and broke display of parents in certian circumstances. + * Work around perl $_ scoping nonsense that caused breakage when loading + external plugins. -- Josh Triplett Wed, 09 Jul 2008 21:30:33 -0700 -- 2.39.2