X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fautohandler;h=3cc8e1021b1764da697ab3c8e2a31c446fc4e73f;hp=ae04d423f7edde9b442747cf95358d782bef1c2d;hb=3f2a7b01b59902faed5767d81e2959e131bdbdfd;hpb=0fb307c305e4bc2c9c27dc25a3308beae3a4d33c

diff --git a/httemplate/autohandler b/httemplate/autohandler
index ae04d423f..3cc8e1021 100644
--- a/httemplate/autohandler
+++ b/httemplate/autohandler
@@ -1,13 +1,18 @@
 % $m->call_next;
 <%init>
+
+  $FS::Maketext::lh = '';
+
   dbh->{'private_profile'} = {} if UNIVERSAL::can(dbh, 'sprintProfile');
+
 </%init>
 <%filter>
 
-my $profile = '';
 if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
 
-  if ( lc($r->content_type) eq 'text/html'
+  my $profile = '';
+
+  if ( $r && lc($r->content_type) =~ /^text\/html/
        && $FS::CurrentUser::CurrentUser->option('show_db_profile')
      )
   {
@@ -35,10 +40,11 @@ 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>