[Catalyst-commits] r6750 - trunk/Catalyst-View-Mason/lib/Catalyst/View

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2007-08-28 16:58:17 +0100 (Tue, 28 Aug 2007)
New Revision: 6750

Modified:
   trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
Log:
Use the application config.


Modified: trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
===================================================================
--- trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2007-08-28 15:58:12 UTC (rev 6749)
+++ trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2007-08-28 15:58:17 UTC (rev 6750)
@@ -72,22 +72,21 @@
 =cut
 
 sub new {
-    my $self = shift;
-    my $c    = shift;
+    my ($self, $c, $arguments) = @_;
 
-    $self = $self->NEXT::new(@_);
-    $self->{output} = '';
-
     my %config = (
         comp_root =>  ( $c->config->{root} . '' ),
         data_dir  => '/tmp',
-        %{ $self->config() },
-        out_method => \$self->{output},
+        %{ $arguments },
     );
 
+    $self = $self->NEXT::new($c, { %config });
+    $self->{output} = '';
+
     $self->template(
         HTML::Mason::Interp->new(
             %config, allow_globals => [qw($c $base $name)],
+            out_method => \$self->{output},
         )
     );