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

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2007-08-28 17:00:55 +0100 (Tue, 28 Aug 2007)
New Revision: 6779

Modified:
   trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
Log:
Allow additional allowed_globals to be configured.


Modified: trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
===================================================================
--- trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2007-08-28 16:00:35 UTC (rev 6778)
+++ trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2007-08-28 16:00:55 UTC (rev 6779)
@@ -73,13 +73,15 @@
     my ($self, $c, $arguments) = @_;
 
     my %config = (
-        comp_root => $c->config->{root}->stringify,
-        data_dir  => File::Spec->tmpdir,
-        use_match => 1,
+        comp_root     => $c->config->{root}->stringify,
+        data_dir      => File::Spec->tmpdir,
+        use_match     => 1,
+        allow_globals => [],
         %{ $self->config },
         %{ $arguments },
     );
 
+    unshift @{ $config{allow_globals} }, qw($c $base $name);
     $self = $self->NEXT::new($c, { %config });
     $self->{output} = '';
 
@@ -89,7 +91,6 @@
     $self->template(
         HTML::Mason::Interp->new(
             %config,
-            allow_globals => [qw($c $base $name)],
             out_method    => \$self->{output},
         )
     );