[Rt-commit] r6526 - in rt/branches/3.7-EXPERIMENTAL: .

[ruz at bestpractical.com]

Author: ruz
Date: Sun Nov 26 17:46:21 2006
New Revision: 6526

Modified:
   rt/branches/3.7-EXPERIMENTAL/   (props changed)
   rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm

Log:
 r4183 at cubic-pc:  cubic | 2006-11-27 01:49:48 +0300
  r3516 at cubic-pc:  cubic | 2006-06-29 07:05:38 +0400
  RT::User::PrincipalObj
  * if there is cached obj then don't check it
  * Principal->ObjectId makes no sense any more so don't use it
  * log error with critical level
  
 


Modified: rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm
==============================================================================
--- rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm	(original)
+++ rt/branches/3.7-EXPERIMENTAL/lib/RT/User_Overlay.pm	Sun Nov 26 17:46:21 2006
@@ -1210,15 +1210,16 @@
 
 sub PrincipalObj {
     my $self = shift;
-    unless ($self->{'PrincipalObj'} && 
-            ($self->{'PrincipalObj'}->ObjectId == $self->Id) &&
-            ($self->{'PrincipalObj'}->PrincipalType eq 'User')) {
-
-            $self->{'PrincipalObj'} = RT::Principal->new($self->CurrentUser);
-            $self->{'PrincipalObj'}->LoadByCols('ObjectId' => $self->Id,
-                                                'PrincipalType' => 'User') ;
-            }
-    return($self->{'PrincipalObj'});
+    unless ( $self->{'PrincipalObj'} ) {
+        my $obj = RT::Principal->new( $self->CurrentUser );
+        $obj->LoadById( $self->id );
+        unless ( $obj->id && $obj->PrincipalType eq 'User' ) {
+            $RT::Logger->crit( 'Wrong principal for user #'. $self->id );
+        } else {
+            $self->{'PrincipalObj'} = $obj;
+        }
+    }
+    return $self->{'PrincipalObj'};
 }