X-Git-Url: http://git.freeside.biz/gitweb/?p=freeside.git;a=blobdiff_plain;f=FS%2FFS%2FMason.pm;h=89140cac10ab70ab8abbe9e806b3cd5043328b15;hp=ee87b2de429274a78178fcddb34ebd070f048787;hb=a36e0f8a0f69349dafaa16d1d2d57dfb6e5dbc85;hpb=2d2662d900652d9b1f242e9affd5a6e67c453f4d

diff --git a/FS/FS/Mason.pm b/FS/FS/Mason.pm
index ee87b2de4..89140cac1 100644
--- a/FS/FS/Mason.pm
+++ b/FS/FS/Mason.pm
@@ -129,6 +129,7 @@ if ( -e $addl_handler_use_file ) {
                     midnight_sql regexp_sql
                    );
   use FS::Conf;
+  use FS::ConfDefaults;
   use FS::CGI qw(header menubar table itable ntable idiot
                  eidiot myexit http_header);
   use FS::UI::Web qw(svc_url random_id
@@ -416,6 +417,7 @@ if ( -e $addl_handler_use_file ) {
   use FS::commission_schedule;
   use FS::commission_rate;
   use FS::saved_search;
+  use FS::sector_coverage;
   # Sammath Naur
 
   if ( $FS::Mason::addl_handler_use ) {
@@ -469,15 +471,19 @@ if ( -e $addl_handler_use_file ) {
   no warnings 'redefine';
   *CGI::redirect = sub {
     my $self = shift;
-    my $cookie = '';
-    if ( $_[0] eq '-cookie' ) { #this isn't actually used at the moment
-      (my $x, $cookie) = (shift, shift);
-      $HTML::Mason::r->err_headers_out->add( 'Set-cookie' => $cookie );
-    }
-    my $location = shift;
 
     use vars qw($m);
 
+    my $location = '';
+    if ( $_[0] =~ /^-/ ) {
+      my %opt = @_;
+      $location = $opt{'-uri'};
+      my $cookie = $opt{'-cookie'};
+      $m->apache_req->err_headers_out->{'Set-cookie'} = $cookie if $cookie;
+    } else {
+      $location = shift;
+    }
+
     # false laziness w/below
     if ( @DBIx::Profile::ISA ) {