fix RT wackiness when loaded concurrently with Fcntl

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

diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index 76c45dc..4e66c3c 100644 (file)
--- a/rt/lib/RT/Config.pm
+++ b/rt/lib/RT/Config.pm
@@ -173,7 +173,7 @@ our %META = (
         WidgetArguments => {
             Description => 'Theme',                  #loc
             # XXX: we need support for 'get values callback'
-            Values => [qw(3.5-default 3.4-compat web2)],
+            Values => [qw(3.5-default 3.4-compat web2 freeside2.1)],
         },
     },
     MessageBoxRichText => {
@@ -821,7 +821,7 @@ sub SetFromConfig {
             # XXX skip references to scalars or other references.
             # Otherwie 5.10 goes boom. may be we should skip any
             # reference
-            return if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
+            next if ref($entry) eq 'SCALAR' || ref($entry) eq 'REF';
             my $entry_ref = *{$entry}{ ref($ref) };
             next unless $entry_ref;