svn commit: r1579816 - in /thrift/cms-site/trunk/lib: path.pm view.pm

[joes]

Author: joes
Date: Thu Mar 20 23:18:33 2014
New Revision: 1579816

URL: http://svn.apache.org/r1579816
Log:
stack views

Modified:
    thrift/cms-site/trunk/lib/path.pm
    thrift/cms-site/trunk/lib/view.pm

Modified: thrift/cms-site/trunk/lib/path.pm
URL: 
http://svn.apache.org/viewvc/thrift/cms-site/trunk/lib/path.pm?rev=1579816&r1=1579815&r2=1579816&view=diff
==============================================================================
--- thrift/cms-site/trunk/lib/path.pm (original)
+++ thrift/cms-site/trunk/lib/path.pm Thu Mar 20 23:18:33 2014
@@ -19,7 +19,7 @@ our @patterns = (
         preprocess => 1,
     }],
     [qr/\.md(?:text)?$/,   memoize => {
-        view       => 'thrift_preprocessor',
+        view       => [qw/thrift_preprocessor single_narrative/],
         conf       => $conf,
         template   => 'default.html',
         preprocess => 1,

Modified: thrift/cms-site/trunk/lib/view.pm
URL: 
http://svn.apache.org/viewvc/thrift/cms-site/trunk/lib/view.pm?rev=1579816&r1=1579815&r2=1579816&view=diff
==============================================================================
--- thrift/cms-site/trunk/lib/view.pm (original)
+++ thrift/cms-site/trunk/lib/view.pm Thu Mar 20 23:18:33 2014
@@ -27,8 +27,8 @@ sub thrift_preprocessor {
                            "{{ " . $key++ . ".fetch$mdfilter }}";
                        }ge;
 
-    delete $args{view};
-    return view->can("single_narrative")->(%args);
+    my $view = ref $args{view} ? shift @{$args{view}} : $args{view};
+    return view->can($view)->(%args);
 }
 
 1;