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.)

diff --git a/IkiWiki.pm b/IkiWiki.pm
index a4657a311e36c37b22daddc6ee88e4416526ca12..ff82e39617ade57148b251173253af9a4db3d206 100644 (file)
--- a/IkiWiki.pm
+++ b/IkiWiki.pm
@@ -151,7 +151,9 @@ sub loadplugins () { #{{{
                unshift @INC, possibly_foolish_untaint($config{libdir});
        }
 
                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) {
 
        run_hooks(getopt => sub { shift->() });
        if (grep /^-/, @ARGV) {

diff --git a/debian/changelog b/debian/changelog
index 9b62fcb2921043a99079e648b178f2102505a033..1b892da40be6ba04b2f026203a638400ba3ec7c5 100644 (file)
--- 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.
   * 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 <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700
 
 
  -- Josh Triplett <josh@freedesktop.org>  Wed, 09 Jul 2008 21:30:33 -0700