[Catalyst-commits] r6681 - in branches: . templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View

[jrockway at dev.catalyst.perl.org]

Author: jrockway
Date: 2007-08-17 15:51:44 +0100 (Fri, 17 Aug 2007)
New Revision: 6681

Modified:
   branches/
   branches/templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View/MicroMason.pm
Log:
 r28461 at foo:  jon | 2007-08-17 09:15:06 -0500
 this is handled by Templated now



Property changes on: branches
___________________________________________________________________
Name: svk:merge
   - d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-branches:28460
   + d7608cd0-831c-0410-93c0-e5b306c3c028:/local/Catalyst-branches:28461

Modified: branches/templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View/MicroMason.pm
===================================================================
--- branches/templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View/MicroMason.pm	2007-08-17 14:51:36 UTC (rev 6680)
+++ branches/templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View/MicroMason.pm	2007-08-17 14:51:44 UTC (rev 6681)
@@ -108,7 +108,7 @@
 sub _render {
     my ($self, $template, $stash, $args) = @_;
 
-    my $c_name = '$'. ($self->{CATALYST_VAR} || 'c');
+    my $c_name = '$'. $self->{CATALYST_VAR};
     
     # Set the URL base, context and name of the app as global Mason vars
     # $base, $c and $name
@@ -118,7 +118,7 @@
                                   '$name' => $self->context->config->{name},
                                  );
     
-    delete $stash->{$self->{CATALYST_VAR} || 'c'};
+    delete $stash->{$self->{CATALYST_VAR}};
     delete $stash->{base};
     delete $stash->{name};