X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fautohandler;h=3cc8e1021b1764da697ab3c8e2a31c446fc4e73f;hp=c676d3d2de5be96ef8250c5ce066686cf3f2b8fd;hb=HEAD;hpb=83053569b3d965924e2e1d4f5b199609ec7c29af

diff --git a/httemplate/autohandler b/httemplate/autohandler
index c676d3d2d..3cc8e1021 100644
--- 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>
@@ -16,7 +12,7 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
   my $profile = '';
 
-  if ( lc($r->content_type) =~ /^text\/html/
+  if ( $r && lc($r->content_type) =~ /^text\/html/
        && $FS::CurrentUser::CurrentUser->option('show_db_profile')
      )
   {
@@ -45,10 +41,10 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
   dbh->{'private_profile'} = {};
 
-  s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)$/$profile$1/i;
+  s/(<\/BODY>[\s\n]*<\/HTML>[\s\n]*)/$profile$1/i;
 }
 
 </%filter>
 <%cleanup>
-   dbh->commit();
+   dbh->commit() if dbh;
 </%cleanup>