[freeside-commits] freeside/FS/FS/Mason Request.pm, 1.3, 1.4 StandaloneRequest.pm, NONE, 1.1

[Ivan,,,]

Update of /home/cvs/cvsroot/freeside/FS/FS/Mason
In directory wavetail.420.am:/tmp/cvs-serv16912/FS/FS/Mason

Modified Files:
	Request.pm 
Added Files:
	StandaloneRequest.pm 
Log Message:
torrus, RT#10574

Index: Request.pm
===================================================================
RCS file: /home/cvs/cvsroot/freeside/FS/FS/Mason/Request.pm,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -w -d -r1.3 -r1.4
--- Request.pm	15 Aug 2010 00:44:54 -0000	1.3
+++ Request.pm	27 Dec 2010 08:40:19 -0000	1.4
@@ -24,7 +24,7 @@
 
     my %opt = @_;
     my $mode = $superclass =~ /Apache/i ? 'apache' : 'standalone';
-    freeside_setup($opt{'comp'}, $mode);
+    $class->freeside_setup($opt{'comp'}, $mode);
 
     $class->SUPER::new(@_);
 
@@ -34,8 +34,7 @@
 # for Mason 1.39 vs. Perl 5.10.0
 
 sub freeside_setup {
-
-    my( $filename, $mode ) = @_;
+    my( $class, $filename, $mode ) = @_;
 
     if ( $filename =~ qr(/REST/\d+\.\d+/NoAuth/) ) {
 

--- NEW FILE: StandaloneRequest.pm ---
package FS::Mason::StandaloneRequest;

use strict;
use warnings;
use base 'FS::Mason::Request';

sub new {
  my $class = shift;

  $class->alter_superclass('HTML::Mason::Request');

  #huh... shouldn't alter_superclass take care of this for us?
  __PACKAGE__->valid_params( %{ HTML::Mason::Request->valid_params() } );

  my %opt = @_;
  #its already been altered# $class->freeside_setup($opt{'comp'}, 'standalone');
  FS::Mason::Request->freeside_setup($opt{'comp'}, 'standalone');

  $class->SUPER::new(@_);

}

1;