From: ivan <ivan>
Date: Wed, 18 Jun 2008 00:42:39 +0000 (+0000)
Subject: REALLY, don't use FS::Conf from Msgcat until runtime... should hopefully FINALLY... 
X-Git-Tag: freeside_1_7_4rc1~285
X-Git-Url: http://git.freeside.biz/gitweb/?a=commitdiff_plain;h=e46cfacbda8027da57555cba882633332e1e082f;p=freeside.git

REALLY, don't use FS::Conf from Msgcat until runtime... should hopefully FINALLY eliminate the Record->Msgcat->Conf->Record loop
---

diff --git a/FS/FS/Msgcat.pm b/FS/FS/Msgcat.pm
index 625743dc0..70933b238 100644
--- a/FS/FS/Msgcat.pm
+++ b/FS/FS/Msgcat.pm
@@ -6,17 +6,19 @@ use Exporter;
 use FS::UID;
 #use FS::Record qw( qsearchs ); # wtf?  won't import...
 use FS::Record;
-use FS::Conf;
+#use FS::Conf; #wtf?  causes dependency loops too.
 use FS::msgcat;
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw( gettext geterror );
 
-$FS::UID::callback{'Msgcat'} = sub {
+FS::UID->install_callback( sub {
+  eval "use FS::Conf;";
+  die $@ if $@;
   $conf = new FS::Conf;
   $locale = $conf->config('locale') || 'en_US';
   $debug = $conf->exists('show-msgcat-codes')
-};
+});
 
 =head1 NAME