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

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2007-10-15 15:37:19 +0100 (Mon, 15 Oct 2007)
New Revision: 6992

Modified:
   trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
Log:
Don't stringify unblessed array ref comp_roots.


Modified: trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm
===================================================================
--- trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2007-10-15 14:37:10 UTC (rev 6991)
+++ trunk/Catalyst-View-Mason/lib/Catalyst/View/Mason.pm	2007-10-15 14:37:19 UTC (rev 6992)
@@ -82,10 +82,13 @@
         %{ $arguments },
     );
 
-    # stringify comp_root and data_dir
-    $config{comp_root} .= q//;
+    # stringify data_dir
     $config{data_dir}  .= q//;
 
+    # stringify comp_root if it isn't an unblessed array reference already
+    $config{comp_root} .= q//
+        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->{output} = q//;