oqapi/webgui
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merging 7.1.3 changes

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
lib/WebGUI/Asset/Post.pm
View file

@ -494,6 +494,7 @@ sub getTemplateVars {
});
}
}
delete $var{'attachment_loop'} unless (scalar(@{$var{'attachment_loop'}}));
return \%var;
}
@ -635,6 +636,7 @@ sub notifySubscribers {
my $thread = $self->getThread;
my $cs = $thread->getParent;
$cs->appendTemplateLabels($var);
$var->{relativeUrl} = $var->{url};
my $siteurl = $self->session->url->getSiteURL();
$var->{url} = $siteurl.$self->getUrl;
$var->{'notify.subscription.message'} = $i18n->get(875,"Asset_Post");

23
lib/WebGUI/Asset/Shortcut.pm
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;