aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@gnu.kitenet.net>2009-08-12 12:33:02 -0400
committerJoey Hess <joey@gnu.kitenet.net>2009-08-12 12:33:02 -0400
commit04014e47755312bb500b28fc10153dd38eeb7131 (patch)
treef132258c36f431f2dc316fc211ec9695cce95ad6
parentb4d7dfcbe1e7ea62f1c25e0534feee58720397ac (diff)
downloadikiwiki-04014e47755312bb500b28fc10153dd38eeb7131.tar
ikiwiki-04014e47755312bb500b28fc10153dd38eeb7131.tar.gz
inline: Avoid use of my $_ as it fails with older perls. Closes: #541215
-rw-r--r--IkiWiki/Plugin/inline.pm6
-rw-r--r--debian/changelog2
2 files changed, 4 insertions, 4 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index e7d6f250e..04ad6ed23 100644
--- 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 95e3905a3..ed7854e8a 100644
--- 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