[Rt-commit] rt branch, 3.9-trunk, updated. rt-3.9.4-12-gab75250

[Jesse Vincent]

The branch, 3.9-trunk has been updated
       via  ab75250ff5222e1f4c17ab3e64f389c43f3a80f8 (commit)
       via  9eb51d21eba24e788689a186d4dc98446114d7fb (commit)
      from  a4eb919243b74da6c6f3e07b70ac04c422ce9a34 (commit)

Summary of changes:
 lib/RT/Principal_Overlay.pm |    4 +++-
 t/customfields/ipv6.t       |    2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

- Log -----------------------------------------------------------------
commit 9eb51d21eba24e788689a186d4dc98446114d7fb
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Sep 29 11:53:06 2010 -0400

    When we're doing SuperUser ACL checks, don't bother with a useless OR

diff --git a/lib/RT/Principal_Overlay.pm b/lib/RT/Principal_Overlay.pm
index 9fb24c5..15ce22f 100755
--- a/lib/RT/Principal_Overlay.pm
+++ b/lib/RT/Principal_Overlay.pm
@@ -368,7 +368,9 @@ sub _HasGroupRight
       "FROM ACL, Principals, CachedGroupMembers WHERE " .
 
       # Only find superuser or rights with the name $right
-      "(ACL.RightName = 'SuperUser' OR ACL.RightName = '$right') "
+      "(ACL.RightName = 'SuperUser' "
+      . ( $right ne 'SuperUser' ? "OR ACL.RightName = '$right'" : '')
+      .") "
 
       # Never find disabled groups.
       . "AND Principals.id = ACL.PrincipalId "

commit ab75250ff5222e1f4c17ab3e64f389c43f3a80f8
Author: Jesse Vincent <jesse at bestpractical.com>
Date:   Wed Sep 29 12:00:05 2010 -0400

    sunnayv appears to have gotten the test count wrong in ipv6.t

diff --git a/t/customfields/ipv6.t b/t/customfields/ipv6.t
index 8ba1a40..8b11df5 100644
--- a/t/customfields/ipv6.t
+++ b/t/customfields/ipv6.t
@@ -3,7 +3,7 @@
 use strict;
 use warnings;
 
-use RT::Test tests => 108;
+use RT::Test tests => 96;
 
 my ( $baseurl, $agent ) = RT::Test->started_ok;
 ok( $agent->login, 'log in' );

-----------------------------------------------------------------------