summaryrefslogtreecommitdiff
path: root/rt/lib/RT/Shredder
diff options
context:
space:
mode:
authorivan <ivan>2011-04-18 23:15:19 +0000
committerivan <ivan>2011-04-18 23:15:19 +0000
commit75162bb14b3e38d66617077843f4dfdcaf09d5c4 (patch)
treed89dd49a476cf2f0859ed6a0adc2992ea6d69d04 /rt/lib/RT/Shredder
parentfc6209f398899f0211cfcedeb81a3cd65e04a941 (diff)
import rt 3.8.10
Diffstat (limited to 'rt/lib/RT/Shredder')
-rw-r--r--rt/lib/RT/Shredder/Plugin.pm5
-rw-r--r--rt/lib/RT/Shredder/Plugin/Base/Search.pm3
2 files changed, 6 insertions, 2 deletions
diff --git a/rt/lib/RT/Shredder/Plugin.pm b/rt/lib/RT/Shredder/Plugin.pm
index 60b5b1835..b7c63ec7f 100644
--- a/rt/lib/RT/Shredder/Plugin.pm
+++ b/rt/lib/RT/Shredder/Plugin.pm
@@ -127,7 +127,10 @@ sub List
push @files, glob $mask;
}
- my %res = map { $_ =~ m/([^\\\/]+)\.pm$/; $1 => $_ } reverse @files;
+ my %res;
+ for my $f (reverse @files) {
+ $res{$1} = $_ if $f =~ /([^\\\/]+)\.pm$/;
+ }
return %res unless $type;
diff --git a/rt/lib/RT/Shredder/Plugin/Base/Search.pm b/rt/lib/RT/Shredder/Plugin/Base/Search.pm
index 1c20b4f03..6f9d6ff01 100644
--- a/rt/lib/RT/Shredder/Plugin/Base/Search.pm
+++ b/rt/lib/RT/Shredder/Plugin/Base/Search.pm
@@ -76,10 +76,11 @@ Allow you to limit search results. B<< Default value is C<10> >>.
sub SupportArgs
{
my %seen;
- return sort
+ my @args = sort
grep $_ && !$seen{$_},
shift->SUPER::SupportArgs(@_),
qw(limit);
+ return @args;
}
sub TestArgs