From 68869d664b978b063c9181d024edb34a63306c33 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 26 Jan 2009 13:17:14 -0500 Subject: [PATCH] remove useless uses of scalar if (scalar @array) is written idiomatically in perl as if (@array). --- IkiWiki/Plugin/po.pm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/IkiWiki/Plugin/po.pm b/IkiWiki/Plugin/po.pm index 3837ca15e..7dfa52f57 100644 --- a/IkiWiki/Plugin/po.pm +++ b/IkiWiki/Plugin/po.pm @@ -275,7 +275,7 @@ sub pagetemplate (@) { $template->param(percenttranslated => percenttranslated($page)); } if ($template->query(name => "istranslation")) { - $template->param(istranslation => scalar istranslation($page)); + $template->param(istranslation => istranslation($page)); } if ($template->query(name => "istranslatable")) { $template->param(istranslatable => istranslatable($page)); @@ -388,7 +388,7 @@ sub change(@) { # at once. As this more or less doubles the time needed to rebuild the # wiki, we do so only when really needed. - if (scalar @rendered + if (@rendered && exists $config{rebuild} && defined $config{rebuild} && $config{rebuild} && UNIVERSAL::can("IkiWiki::Plugin::meta", "getsetup") && exists $config{meta_overrides_page_title} @@ -474,7 +474,7 @@ sub canrename ($$@) { # by looking for the master page in the list of to-be-renamed pages we # saved early in the renaming process. my $orig_torename = $session->param("po_orig_torename"); - unless (scalar grep { $_->{src} eq $masterpage } @{$orig_torename}) { + unless (grep { $_->{src} eq $masterpage } @{$orig_torename}) { return gettext("Can not rename a translation. Renaming the master page, ". "though, renames its translations as well."); } @@ -542,7 +542,7 @@ sub formbuilder (@) { if ($field->type eq 'select') { # remove po from the list of types my @types = grep { $_ ne 'po' } $field->options; - $field->options(\@types) if scalar @types; + $field->options(\@types) if @types; } else { # make sure the default value is not po; @@ -989,7 +989,7 @@ sub deletetranslations ($) { } } @todelete; - if (scalar @todelete) { + if (@todelete) { commit_and_refresh( gettext("removed obsolete PO files"), "IkiWiki::Plugin::po::deletetranslations");