X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=htetc%2Fhandler.pl;h=e065f092b20e6ac829672cf7caa96bc9ec2dc3f4;hp=952d6203b797d48c8afe064dd65fa3732e7f6217;hb=aed8ec35ccb9cdeb7ea0cb6ff2946f9d83d582f6;hpb=63a268637b2d51a8766412617724b9436439deb6 diff --git a/htetc/handler.pl b/htetc/handler.pl index 952d6203b..e065f092b 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -44,8 +44,8 @@ sub handler ###Module::Refresh->refresh;### - #$r->content_type('text/html; charset=utf-8'); - $r->content_type('text/html; charset=iso-8859-1'); + $r->content_type('text/html; charset=utf-8'); + #$r->content_type('text/html; charset=iso-8859-1'); #eorar my $headers = $r->headers_out; @@ -57,16 +57,17 @@ sub handler if ( $r->filename =~ /\/rt\// ) { #RT - $ah->interp($rt_interp); + # We don't need to handle non-text, non-xml items + return -1 if defined( $r->content_type ) + && $r->content_type !~ m!(^text/|\bxml\b)!io; + local $SIG{__WARN__}; local $SIG{__DIE__}; RT::Init(); - # We don't need to handle non-text, non-xml items - return -1 if defined( $r->content_type ) - && $r->content_type !~ m!(^text/|\bxml\b)!io; + $ah->interp($rt_interp); } else { @@ -76,8 +77,11 @@ sub handler RT::Init() if $RT::VERSION; #for lack of something else #we don't want the RT error handlers under FS - undef $SIG{__WARN__} if defined($SIG{__WARN__}); - undef $SIG{__DIE__} if defined($SIG{__DIE__} ); + { + no warnings 'uninitialized'; + undef($SIG{__WARN__}) if defined($SIG{__WARN__}); + undef($SIG{__DIE__}) if defined($SIG{__DIE__} ); + } $ah->interp($fs_interp);