[Rt-commit] r18369 - rt/3.8/trunk/lib/RT

[ruz at bestpractical.com]

Author: ruz
Date: Fri Feb 13 12:24:25 2009
New Revision: 18369

Modified:
   rt/3.8/trunk/lib/RT/System.pm

Log:
* prefer plural forms on system level

Modified: rt/3.8/trunk/lib/RT/System.pm
==============================================================================
--- rt/3.8/trunk/lib/RT/System.pm	(original)
+++ rt/3.8/trunk/lib/RT/System.pm	Fri Feb 13 12:24:25 2009
@@ -129,6 +129,12 @@
 
     # Build a merged list of all system wide rights, queue rights and group rights.
     my %rights = (%{$RIGHTS}, %{$gr}, %{$qr}, %{$cr});
+
+    # prefer plural forms
+    foreach my $right ( grep !/s$/, keys %rights ) {
+        delete $rights{ $right } if exists $rights{ $right .'s' };
+    }
+
     return(\%rights);
 }