X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=lib%2FMaypole%2FView%2FBase.pm;h=312d38ba24aeeb3f3e70809776a788433751a5f2;hb=3a9e643a6a5fa96ca69b56ced03db9569fd96e2e;hp=f7881a2e27106c9bc7bd536993ba3d4ff0c23232;hpb=45e4b287c0925cab5cc2692093034275dd0d17b9;p=maypole.git

diff --git a/lib/Maypole/View/Base.pm b/lib/Maypole/View/Base.pm
index f7881a2..312d38b 100644
--- a/lib/Maypole/View/Base.pm
+++ b/lib/Maypole/View/Base.pm
@@ -35,9 +35,8 @@ sub vars {
           # ...
     );
     if ($class) {
-        my $classmeta = $args{classmetadata} ||= {};
+        my $classmeta = $r->template_args->{classmetadata} ||= {};
         $classmeta->{name}              ||= $class;
-        $classmeta->{description}       ||= $class->description;
         $classmeta->{table}             ||= $class->table;
         $classmeta->{columns}           ||= [ $class->display_columns ];
         $classmeta->{list_columns}      ||= [ $class->list_columns ];
@@ -57,9 +56,7 @@ sub vars {
     }
 
     # Overrides
-    local $r->{template_args} = $r->{template_args};
-    delete $r->{template_args}{classmetadata}; # already overrides
-    %args = ( %args, %{ $r->{template_args} || {} } );
+    %args = ( %args, %{ $r->template_args || {} } );
     %args;
 }