1 files changed, 21 insertions, 4 deletions

diff --git a/rt/lib/RT/Config.pm b/rt/lib/RT/Config.pm
index ff93c8478..e3bdbe90b 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 => {
@@ -336,6 +336,16 @@ our %META = (
             Hints => 'Use css rules to display text monospaced and with formatting preserved, but wrap as needed.  This does not work well with IE6 and you should use the previous option', #loc
         },
     },
+    DisplayAfterQuickCreate => {
+        Section         => 'Ticket display',
+        Overridable     => 1,
+        SortOrder       => 6,
+        Widget          => '/Widgets/Form/Boolean',
+        WidgetArguments => {
+            Description => 'On Quick Create, redirect to ticket display', #loc
+            #Hints => '', #loc
+        },
+    },
 
     # User overridable locale options
     DateTimeFormat => {
@@ -898,11 +908,10 @@ sub Meta {
 sub Sections {
     my $self = shift;
     my %seen;
-    my @sections = sort
+    return sort
         grep !$seen{$_}++,
         map $_->{'Section'} || 'General',
         values %META;
-    return @sections;
 }
 
 sub Options {
@@ -931,6 +940,14 @@ sub Options {
     return @res;
 }
 
-RT::Base->_ImportOverlays();
+eval "require RT::Config_Vendor";
+if ($@ && $@ !~ qr{^Can't locate RT/Config_Vendor.pm}) {
+    die $@;
+};
+
+eval "require RT::Config_Local";
+if ($@ && $@ !~ qr{^Can't locate RT/Config_Local.pm}) {
+    die $@;
+};
 
 1;