[Bps-public-commit] RT-Extension-MergeUsers branch, master, updated. 0.08-9-g20fbf53

[Thomas Sibley]

The branch, master has been updated
       via  20fbf53cfb4655cb08d9c2cf7d13c34d5df49b76 (commit)
      from  c1a2128a1e57a9b285af84174d4d69bc18e97d15 (commit)

Summary of changes:
 lib/RT/Extension/MergeUsers.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

- Log -----------------------------------------------------------------
commit 20fbf53cfb4655cb08d9c2cf7d13c34d5df49b76
Author: Thomas Sibley <trs at bestpractical.com>
Date:   Tue May 7 12:23:49 2013 -0700

    Always lookup effective ids on RT::User
    
    This allows merged users to be properly picked up when loaded via an
    RT::CurrentUser object, such as during login.
    
    An equivalent core change, on 4.0/currentuser-attributes, is also
    necessary to prevent inconsistency.

diff --git a/lib/RT/Extension/MergeUsers.pm b/lib/RT/Extension/MergeUsers.pm
index b0a8953..290cc72 100644
--- a/lib/RT/Extension/MergeUsers.pm
+++ b/lib/RT/Extension/MergeUsers.pm
@@ -142,7 +142,7 @@ sub LoadByCols {
         my $effective_id = RT::Attribute->new( $RT::SystemUser );
         $effective_id->LoadByCols(
             Name       => 'EffectiveId',
-            ObjectType => ref($self) || $self,
+            ObjectType => __PACKAGE__,
             ObjectId   => $oid,
         );
         if ( $effective_id->id && $effective_id->Content && $effective_id->Content != $oid ) {

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