summaryrefslogtreecommitdiff
path: root/rt/lib/RT/Config.pm
diff options
context:
space:
mode:
Diffstat (limited to 'rt/lib/RT/Config.pm')
-rw-r--r--rt/lib/RT/Config.pm20
1 files changed, 11 insertions, 9 deletions
diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index f8d121c..ce66bb6 100644
--- 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 => {
@@ -340,13 +340,15 @@ our %META = (
my $value = $self->Get('RTAddressRegexp');
return if $value;
- $RT::Logger->error(
- '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'
- .' emails on addresses that are not in the database or config.'
- );
+ #XXX freeside - should fix this at some point, but it is being WAY
+ #too noisy in the logs
+ #$RT::Logger->error(
+ # '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'
+ # .' emails on addresses that are not in the database or config.'
+ #);
},
},
# User overridable mail options
@@ -847,7 +849,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;