projects
/
freeside.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix that blank-page-instead-of-profiling-redirect-when-called-from-an-include bug...
[freeside.git]
/
htetc
/
handler.pl
diff --git
a/htetc/handler.pl
b/htetc/handler.pl
index
851b2e7
..
9b808e6
100644
(file)
--- a/
htetc/handler.pl
+++ b/
htetc/handler.pl
@@
-88,7
+88,7
@@
sub handler
#rar
{ package HTML::Mason::Commands;
use strict;
#rar
{ package HTML::Mason::Commands;
use strict;
- use vars qw( $cgi $p );
+ use vars qw( $cgi $p
$fsurl
);
use vars qw( %session );
use CGI 2.47 qw(-private_tempfiles);
#use CGI::Carp qw(fatalsToBrowser);
use vars qw( %session );
use CGI 2.47 qw(-private_tempfiles);
#use CGI::Carp qw(fatalsToBrowser);
@@
-118,8
+118,8
@@
sub handler
use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
use FS::Record qw(qsearch qsearchs fields dbdef);
use FS::Conf;
use FS::UID qw(cgisuidsetup dbh getotaker datasrc driver_name);
use FS::Record qw(qsearch qsearchs fields dbdef);
use FS::Conf;
- use FS::CGI qw(header menubar popurl
table itable ntable idiot e
idiot
- small_custview myexit http_header);
+ use FS::CGI qw(header menubar popurl
rooturl table itable ntable
idiot
+
eidiot
small_custview myexit http_header);
use FS::UI::Web;
use FS::Msgcat qw(gettext geterror);
use FS::Misc qw( send_email send_fax );
use FS::UI::Web;
use FS::Msgcat qw(gettext geterror);
use FS::Misc qw( send_email send_fax );
@@
-171,6
+171,10
@@
sub handler
use FS::payment_gateway;
use FS::agent_payment_gateway;
use FS::XMLRPC;
use FS::payment_gateway;
use FS::agent_payment_gateway;
use FS::XMLRPC;
+ use FS::payby;
+ use FS::cdr;
+ use FS::inventory_class;
+ use FS::inventory_item;
if ( %%%RT_ENABLED%%% ) {
eval '
if ( %%%RT_ENABLED%%% ) {
eval '
@@
-187,7
+191,7
@@
sub handler
use RT::GroupMembers;
use RT::CustomFields;
use RT::CustomFieldValues;
use RT::GroupMembers;
use RT::CustomFields;
use RT::CustomFieldValues;
- use RT::
Ticke
tCustomFieldValues;
+ use RT::
Objec
tCustomFieldValues;
use RT::Interface::Web;
use MIME::Entity;
use RT::Interface::Web;
use MIME::Entity;
@@
-233,9
+237,9
@@
sub handler
&cgisuidsetup($cgi);
#&cgisuidsetup($r);
$p = popurl(2);
&cgisuidsetup($cgi);
#&cgisuidsetup($r);
$p = popurl(2);
+ $fsurl = rooturl();
}
}
-
sub include {
use vars qw($m);
$m->scomp(@_);
sub include {
use vars qw($m);
$m->scomp(@_);
@@
-261,7
+265,10
@@
sub handler
);
dbh->{'private_profile'} = {};
);
dbh->{'private_profile'} = {};
- $m->abort(200);
+ #whew. removing this is all that's needed to fix the annoying
+ #blank-page-instead-of-profiling-redirect-when-called-from-an-include
+ #bug triggered by mason 1.32
+ #my $rv = $m->abort(200);
} else { #normal redirect
} else { #normal redirect