merge NG auth, RT#21563

[freeside.git] / httemplate / autohandler

diff --git a/httemplate/autohandler b/httemplate/autohandler
index c676d3d..b5b1071 100644 (file)
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -1,13 +1,9 @@
 % $m->call_next;
 <%init>
 
-  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
+  $FS::Maketext::lh = '';
 
-  my $locale =  $FS::CurrentUser::CurrentUser->option('locale')
-             || FS::Conf->new->config('locale')
-             || 'en_US';
-  $locale =~ s/_/-/g;
-  $lh = FS::L10N->get_handle($locale) || die "Unknown locale $locale";
+  dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
 
 </%init>
 <%filter>
@@ -50,5 +46,5 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
 </%filter>
 <%cleanup>
-   dbh->commit();
+   dbh->commit() if dbh;
 </%cleanup>