rt 4.0.23

[freeside.git] / rt / lib / RT / Config.pm

diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index 2344193..8d30739 100644 (file)
--- a/rt/lib/RT/Config.pm
+++ b/rt/lib/RT/Config.pm
@@ -2,7 +2,7 @@
 #
 # COPYRIGHT:
 #
 #
 # COPYRIGHT:
 #

-# This software is Copyright (c) 1996-2014 Best Practical Solutions, LLC
+# This software is Copyright (c) 1996-2015 Best Practical Solutions, LLC

 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)
 #                                          <sales@bestpractical.com>
 #
 # (Except where explicitly superseded by other copyright notices)


@@ -460,7 +460,7 @@ our %META = (
                     'The RTAddressRegexp option is not set in the config.'
                     .' Not setting this option results in additional SQL queries to'
                     .' check whether each address belongs to RT or not.'
                     'The RTAddressRegexp option is not set in the config.'
                     .' Not setting this option results in additional SQL queries to'
                     .' check whether each address belongs to RT or not.'

-                    .' It is especially important to set this option if RT recieves'
+                    .' It is especially important to set this option if RT receives'

                     .' emails on addresses that are not in the database or config.'
                 );
             } elsif (ref $value and ref $value eq "Regexp") {
                     .' emails on addresses that are not in the database or config.'
                 );
             } elsif (ref $value and ref $value eq "Regexp") {


@@ -1024,7 +1024,6 @@ sub Get {
 
     my $res;
     if ( $user && $user->id && $META{$name}->{'Overridable'} ) {
 
     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;
     }
         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 };
             $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
             next unless $entry_ref;
 
             # if references are equal then we've found