Merge commit 'v7.10.20' into WebGUI8

2011-10-26 15:02:51 -07:00 · 2011-10-26 15:02:51 -07:00 · fdb979ca8a
commit fdb979ca8a
parent 4fea10a1f5 7fda01b291
72 changed files with 830 additions and 224 deletions
--- a/lib/WebGUI/Asset.pm
+++ b/lib/WebGUI/Asset.pm
@ -2395,6 +2395,7 @@ sub processTemplate {
            %{$self->get},
            'title'     => $self->getTitle,
            'menuTitle' => $self->getMenuTitle,
+            'keywords'  => $self->get('keywords'),
            %{$var},
        );
        return $template->process(\%vars);