merging 7.1.3 changes

This commit is contained in:
JT Smith 2006-10-30 20:20:24 +00:00
parent 6c46d97eea
commit b9010b8c07
7 changed files with 33 additions and 10 deletions

View file

@ -871,12 +871,23 @@ sub www_saveOverride {
#-------------------------------------------------------------------
sub www_view {
# Hrrrm. Why doesn't the default www_view work here?
my $self = shift;
my $check = $self->checkView;
return $check if defined $check;
$self->prepareView;
return $self->view;
my $self = shift;
my $check = $self->checkView;
return $check if defined $check;
my $shortcut = $self->getShortcut;
$self->prepareView;
if ($shortcut->get("className") =~ m/Asset::Wobject/) {
$self->session->http->setLastModified($self->getContentLastModified);
$self->session->http->sendHeader;
$shortcut->prepareView;
my $style = $shortcut->processStyle("~~~");
my ($head, $foot) = split("~~~",$style);
$self->session->output->print($head, 1);
$self->session->output->print($self->view);
$self->session->output->print($foot, 1);
return "chunked";
}
return $shortcut->www_view;
}
1;