diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | htetc/handler.pl | 21 |
2 files changed, 11 insertions, 11 deletions
@@ -170,6 +170,7 @@ install-docs: check-conflicts docs cp htetc/handler.pl ${MASON_HANDLER} perl -p -i -e "\ s|%%%FREESIDE_EXPORT%%%|${FREESIDE_EXPORT}|g;\ + s'%%%RT_ENABLED%%%'${RT_ENABLED}'g; \ " ${MASON_HANDLER} || true mkdir -p ${FREESIDE_EXPORT}/profile chown freeside ${FREESIDE_EXPORT}/profile diff --git a/htetc/handler.pl b/htetc/handler.pl index 2e6fbe586..d7c56572c 100644 --- a/htetc/handler.pl +++ b/htetc/handler.pl @@ -7,6 +7,14 @@ use warnings; use FS::Mason qw( mason_interps ); use FS::Trace; +if ( %%%RT_ENABLED%%% ) { + require RT; + $> = scalar(getpwnam('freeside')); + RT::LoadConfig(); + RT::Init(); + $> = $<; +} + #use vars qw($r); # Bring in ApacheHandler, necessary for mod_perl integration. @@ -151,19 +159,10 @@ sub handler $status; } -my $rt_initialized = 0; - sub my_rt_init { return unless $RT::VERSION; - - if ( $rt_initialized ) { - RT::ConnectToDatabase(); - RT::InitSignalHandlers(); - } else { - RT::LoadConfig(); - RT::Init(); - $rt_initialized++; - } + RT::ConnectToDatabase(); + RT::InitSignalHandlers(); } 1; |