[Rt-commit] r3465 - in rt/branches/3.4-RELEASE: . lib lib/RT

[kevinr at bestpractical.com]

Author: kevinr
Date: Tue Jul 12 18:12:03 2005
New Revision: 3465

Modified:
   rt/branches/3.4-RELEASE/   (props changed)
   rt/branches/3.4-RELEASE/lib/RT.pm.in
   rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
Log:
 r6225 at sad-girl-in-snow:  kevinr | 2005-07-12 18:06:39 -0400
 * Applied Ruslan Zakirov's patch to clean up the ACE code and a trailing \n


Modified: rt/branches/3.4-RELEASE/lib/RT.pm.in
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT.pm.in	(original)
+++ rt/branches/3.4-RELEASE/lib/RT.pm.in	Tue Jul 12 18:12:03 2005
@@ -279,10 +279,12 @@
 ## mechanism (see above).
 
 $SIG{__WARN__} = sub {
+    my $w = shift;
+    $w =~ s/(?:\r*\n)+$//;
     # The 'wide character' warnings has to be silenced for now, at least
     # until HTML::Mason offers a sane way to process both raw output and
     # unicode strings.
-    $RT::Logger->warning($_[0]) if index($_[0], 'Wide character in ') != 0;
+    $RT::Logger->warning($w) if index($w, 'Wide character in ') != 0;
 };
 
 #When we call die, trap it and log->crit with the value of the die.

Modified: rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm
==============================================================================
--- rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm	(original)
+++ rt/branches/3.4-RELEASE/lib/RT/ACE_Overlay.pm	Tue Jul 12 18:12:03 2005
@@ -244,14 +244,13 @@
 
 
     if ($args{'Object'} && ($args{'ObjectId'} || $args{'ObjectType'})) {
-        use Carp;
-        $RT::Logger->crit(Carp::cluck("ACE::Create called with an ObjectType or an ObjectId"));
+        $RT::Logger->crit("ACE::Create called with an ObjectType or an ObjectId");
+        return ( 0, $self->loc("System error. Right not granted.") );
     }
 
-
-    
     unless ($args{'Object'} && UNIVERSAL::can($args{'Object'},'id')) {
-            return ( 0, $self->loc("System error. Right not granted.") );
+        $RT::Logger->crit("ACE::Create called with Object that has no id method");
+        return ( 0, $self->loc("System error. Right not granted.") );
     }
     # {{{ Check the ACL
 
@@ -302,9 +301,6 @@
         }
     }
 
-    unless ( $args{'RightName'} ) {
-        return ( 0, $self->loc('Invalid right') );
-    }
     # }}}
 
     # Make sure the right doesn't already exist.