diff options
Diffstat (limited to 'rt/lib/RT/Config.pm')
| -rw-r--r-- | rt/lib/RT/Config.pm | 32 |
1 files changed, 30 insertions, 2 deletions
diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm index 76c45dcbd..ce66bb6cc 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 => { @@ -333,6 +333,24 @@ our %META = ( }, }, + RTAddressRegexp => { + Type => 'SCALAR', + PostLoadCheck => sub { + my $self = shift; + my $value = $self->Get('RTAddressRegexp'); + return if $value; + + #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 EmailFrequency => { Section => 'Mail', #loc @@ -349,6 +367,16 @@ our %META = ( ] } }, + NotifyActor => { + Section => 'Mail', #loc + Overridable => 1, + SortOrder => 2, + Widget => '/Widgets/Form/Boolean', + WidgetArguments => { + Description => 'Outgoing mail', #loc + Hints => 'Should RT send you mail for ticket updates you make?', #loc + } + }, # this tends to break extensions that stash links in ticket update pages Organization => { @@ -821,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; |