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

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2008-05-28 14:47:38 +0100 (Wed, 28 May 2008)
New Revision: 7839

Modified:
   trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
Log:
Catalyst::Component::new gets $app, not $c.


Modified: trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
===================================================================
--- trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2008-05-28 13:47:27 UTC (rev 7838)
+++ trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2008-05-28 13:47:38 UTC (rev 7839)
@@ -65,18 +65,18 @@
 
 =cut
 
-=head2 new($c, \%config)
+=head2 new($app, \%config)
 
 =cut
 
 sub new {
-    my ($self, $c, $arguments) = @_;
+    my ($self, $app, $arguments) = @_;
 
     my %config = (
-        comp_root                        => $c->config->{root},
+        comp_root                        => $app->config->{root},
         data_dir                         => File::Spec->catdir(
             File::Spec->tmpdir,
-            sprintf('%s_%d_mason_data_dir', $c, $<),
+            sprintf('%s_%d_mason_data_dir', $app, $<),
         ),
         use_match                        => 1,
         allow_globals                    => [],
@@ -94,7 +94,7 @@
         if blessed($config{comp_root}) || ref $config{comp_root} ne 'ARRAY';
 
     unshift @{ $config{allow_globals} }, qw/$c $base $name/;
-    $self = $self->NEXT::new($c, \%config);
+    $self = $self->NEXT::new($app, \%config);
     $self->{output} = q//;
 
     $self->config({ %config });
@@ -107,7 +107,7 @@
     /};
 
     if ($self->config->{use_match}) {
-        $c->log->warn(sprintf(<<'EOW', ref $self));
+        $app->log->warn(sprintf(<<'EOW', ref $self));
 DEPRECATION WARNING: %s sets the use_match config variable to a true value.
 This has been deprecated. Please see the Catalyst::View::Mason
 documentation for details on use_match.