diff options
Diffstat (limited to 'rt/lib/RT/Config.pm')
| -rw-r--r-- | rt/lib/RT/Config.pm | 30 |
1 files changed, 2 insertions, 28 deletions
diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm index f8d121ced..4e66c3cff 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,22 +333,6 @@ our %META = ( }, }, - RTAddressRegexp => { - Type => 'SCALAR', - PostLoadCheck => sub { - my $self = shift; - 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.' - ); - }, - }, # User overridable mail options EmailFrequency => { Section => 'Mail', #loc @@ -365,16 +349,6 @@ 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 => { @@ -847,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; |