[Rt-commit] rt branch, 4.2/perl-5.19.4-compat, created. rt-4.2.2-53-gcaa19de

[Alex Vandiver]

The branch, 4.2/perl-5.19.4-compat has been created
        at  caa19de0df55392ef3c34c138a53470abbe545f9 (commit)

- Log -----------------------------------------------------------------
commit caa19de0df55392ef3c34c138a53470abbe545f9
Author: Alex Vandiver <alexmv at bestpractical.com>
Date:   Tue Feb 11 18:44:03 2014 -0500

    Fix precedence errors found by perl 5.19.4 of return ... and ...
    
    Other errors are fixed in 3156d1b9, and will be resolved on merge-up
    from 4.0-trunk.

diff --git a/lib/RT/Ticket.pm b/lib/RT/Ticket.pm
index ce20489..a2c1fbf 100644
--- a/lib/RT/Ticket.pm
+++ b/lib/RT/Ticket.pm
@@ -446,8 +446,9 @@ sub Create {
         AdminCc   => sub {
             my $principal = shift;
             return 1 if $self->CurrentUserHasRight('ModifyTicket');
-            return $principal->id == $self->CurrentUser->PrincipalId
-                and $self->CurrentUserHasRight("WatchAsAdminCc");
+            return unless $self->CurrentUserHasRight("WatchAsAdminCc");
+            return unless $principal->id == $self->CurrentUser->PrincipalId;
+            return 1;
         },
         Owner     => sub {
             my $principal = shift;

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