merging back with HEAD

This commit is contained in:
Colin Kuskie 2009-02-27 06:06:05 +00:00
parent cd30eb437c
commit f8b11b5423
42 changed files with 1201 additions and 182 deletions

View file

@ -647,7 +647,8 @@ sub prepareView {
= WebGUI::Asset::Template->new($self->session, $templateId);
$template->prepare($self->getMetaDataAsTemplateVariables);
$self->{_viewTemplate} = $template;
$self->{_viewTemplate} = $template;
$self->{_viewVariables} = $self->getTemplateVars;
}
#----------------------------------------------------------------------------
@ -776,7 +777,7 @@ to be displayed within the page style.
sub view {
my $self = shift;
my $session = $self->session;
my $var = $self->getTemplateVars;
my $var = delete $self->{_viewVariables};
my $p = $self->getFilePaginator;
$p->appendTemplateVars( $var );