X-Git-Url: http://git.freeside.biz/gitweb/?a=blobdiff_plain;f=htetc%2Fglobal.asa;h=6f76fd2565be092b16d4900896fb72b1eed2da1e;hb=58d44fbe5eb9ab32e6d87063a4a3b22ddba9a828;hp=5fd89957f372970e3c293ae196728e2ac0c47cac;hpb=0354f39ed0e74fd2eae1d9da13906625b4f56591;p=freeside.git diff --git a/htetc/global.asa b/htetc/global.asa index 5fd89957f..6f76fd256 100644 --- a/htetc/global.asa +++ b/htetc/global.asa @@ -42,6 +42,7 @@ use FS::part_pkg; use FS::part_referral; use FS::part_svc; use FS::part_svc_router; +use FS::part_virtual_field; use FS::pkg_svc; use FS::port; use FS::queue qw(joblisting); @@ -53,11 +54,7 @@ use FS::svc_domain; use FS::svc_forward; use FS::svc_www; use FS::router; -use FS::part_router_field; -use FS::router_field; use FS::addr_block; -use FS::part_sb_field; -use FS::sb_field; use FS::svc_broadband; use FS::type_pkgs; use FS::part_export; @@ -110,8 +107,12 @@ sub Script_OnFlush { my $ref = $Response->{BinaryRef}; #$$ref = $cgi->header( @FS::CGI::header ) . $$ref; #$$ref = $cgi->header() . $$ref; - if ( dbh->can('sprintProfile') ) { - if ( lc($Response->{ContentType}) eq 'text/html' ) { + #warn "Script_OnFlush called with dbh ". dbh. "\n"; + #if ( dbh->can('sprintProfile') ) { + if ( UNIVERSAL::can(dbh,'sprintProfile') ) { + #warn "dbh can sprintProfile\n"; + if ( lc($Response->{ContentType}) eq 'text/html' ) { #con + #warn "contenttype is sprintProfile\n"; $$ref =~ s/<\/BODY>[\s\n]*<\/HTML>[\s\n]*$//i or warn "can't remove"; @@ -126,7 +127,9 @@ sub Script_OnFlush { } } -if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) { +#if ( defined(@DBIx::Profile::ISA) && DBIx::Profile::db->can('sprintProfile') ) { +#if ( defined(@DBIx::Profile::ISA) && UNIVERSAL::can('DBIx::Profile::db', 'sprintProfile') ) { +if ( defined(@DBIx::Profile::ISA) ) { #warn "enabling profiling redirects"; *CGI::redirect = sub {