[freeside-commits] freeside/FS/FS Conf.pm,1.140,1.141

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS
In directory wavetail:/tmp/cvs-serv10481

Modified Files:
	Conf.pm 
Log Message:
make sure config still works if no ticket system is configured...

Index: Conf.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Conf.pm,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- Conf.pm	15 Oct 2005 13:37:22 -0000	1.140
+++ Conf.pm	15 Oct 2005 13:40:30 -0000	1.141
@@ -1474,18 +1474,21 @@
     'section'     => '',
     'description' => 'Default queue used when creating new customer tickets.',
     'type'        => 'select-sub',
-    'options_sub' => sub { eval "use FS::TicketSystem;";
-                           die $@ if $@;
+    'options_sub' => sub {
                            my $conf = new FS::Conf;
                            if ( $conf->config('ticket_system') ) {
+                             eval "use FS::TicketSystem;";
+                             die $@ if $@;
                              FS::TicketSystem->queues();
                            } else {
                              ();
                            }
                          },
-    'option_sub'  => sub { eval "use FS::TicketSystem;";
-                           die $@ if $@;
+    'option_sub'  => sub { 
+                           my $conf = new FS::Conf;
                            if ( $conf->config('ticket_system') ) {
+                             eval "use FS::TicketSystem;";
+                             die $@ if $@;
                              FS::TicketSystem->queue(shift);
                            } else {
                              '';