X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=rt%2Flib%2FRT%2FConfig.pm;h=b97802f7ae3e62dad886ae36a0199b7bdc39dd27;hb=88221aab94693778dcf8173ef2bc55946c95f710;hp=23441934f2e86e321faa09ee6893f49a08994084;hpb=0ea23112cfa0d82738b0f08d60d90579721b7524;p=freeside.git

diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index 23441934f..b97802f7a 100644
--- a/rt/lib/RT/Config.pm
+++ b/rt/lib/RT/Config.pm
@@ -1024,7 +1024,6 @@ sub Get {
 
     my $res;
     if ( $user && $user->id && $META{$name}->{'Overridable'} ) {
-        $user = $user->UserObj if $user->isa('RT::CurrentUser');
         my $prefs = $user->Preferences($RT::System);
         $res = $prefs->{$name} if $prefs;
     }
@@ -1234,6 +1233,7 @@ sub SetFromConfig {
             $ref_type = 'SCALAR' if $ref_type eq 'REF';
 
             my $entry_ref = *{$entry}{ $ref_type };
+            next if ref $entry_ref && ref $entry_ref ne ref $ref;
             next unless $entry_ref;
 
             # if references are equal then we've found