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

[jrockway at dev.catalyst.perl.org]

Author: jrockway
Date: 2007-08-18 22:43:57 +0100 (Sat, 18 Aug 2007)
New Revision: 6689

Modified:
   branches/
   branches/templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View/MicroMason.pm
Log:
 r28483 at foo:  jon | 2007-08-18 16:08:18 -0500
 warn about $c->stash->{file}, which breaks MicroMason



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

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-18 21:42:01 UTC (rev 6688)
+++ branches/templated_conversion/Catalyst-View-MicroMason/lib/Catalyst/View/MicroMason.pm	2007-08-18 21:43:57 UTC (rev 6689)
@@ -128,6 +128,9 @@
     delete $stash->{$self->{CATALYST_VAR}};
     delete $stash->{base};
     delete $stash->{name};
+
+    warn "MicroMason: using a stash key called 'file' sets the template" 
+      if exists $stash->{file};
     
     return $self->_template->execute(file => $template, %$stash);
 }