X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=httemplate%2Fautohandler;h=3cc8e1021b1764da697ab3c8e2a31c446fc4e73f;hp=3a244170308710d375360ca95dc2efb33b3d288b;hb=833cfe5c9938d33c3e6b97ed610c25a7afa6eb04;hpb=1c051d721533307ff9d1879deb3107e3a51058fa

diff --git a/httemplate/autohandler b/httemplate/autohandler
index 3a2441703..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')
      )
   {
@@ -29,16 +34,17 @@ if ( UNIVERSAL::can(dbh, 'sprintProfile') ) {
   if ( $FS::CurrentUser::CurrentUser->option('save_db_profile') ) {
     #my $file = %%%FREESIDE_LOG%%%; #substitute here?  maybe get from FS.pm?
     my $file = '/usr/local/etc/freeside/'; #bah
-    $file .= "dbix_profile..$$.". time;
+    $file .= "dbix_profile.$$.". time;
     dbh->setLogFile($file);
     dbh->printProfile();
   }
 
   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>