inline: Avoid use of my $_ as it fails with older perls. Closes: #541215

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e7d6f250e5cfee1d563bfb40bdf8d541cb7aad1e..04ad6ed2308526b47666ca2fe8db1ab1c199b6b4 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -186,7 +186,6 @@ sub preprocess_inline (@) {
        my @list;
 
        if (exists $params{pagenames}) {
-
                foreach my $p (qw(sort pages)) {
                        if (exists $params{$p}) {
                                error sprintf(gettext("the %s and %s parameters cannot be used together"),
@@ -194,9 +193,8 @@ sub preprocess_inline (@) {
                        }
                }
 
-               @list = split ' ', $params{pagenames};
-               my $_;
-               @list = map { bestlink($params{page}, $_) } @list;
+               @list = map { bestlink($params{page}, $_) }
+                       split ' ', $params{pagenames};
 
                $params{pages} = join(" or ", @list);
        }

diff --git a/debian/changelog b/debian/changelog
index 95e3905a389267a3f7cecbf2b0dd8eed9e69fa69..ed7854e8aa26985818e50715d6a9a1d6a42ccc44 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ ikiwiki (3.141593) UNRELEASED; urgency=low
 
   * po: Detect if nowrapi18n can't be passed to po4a, and warn about
     the old version, but continue. Closes: #541205 
+  * inline: Avoid use of my $_ as it fails with older perls.
+    Closes: #541215
 
  -- Joey Hess <joeyh@debian.org>  Wed, 12 Aug 2009 12:25:30 -0400