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

Merge branch 'master' into WebGUI8

Browse source
This commit is contained in:
Graham Knop 2010-04-13 07:50:02 -05:00
commit 2400f19099
797 changed files with 33894 additions and 27196 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/WebGUI/Asset/File.pm
View file

@ -575,7 +575,7 @@ Generate the view method for the Asset, and handle caching.
sub view {
my $self = shift;
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
my $out = eval{$self->session->cache->get("view_".$self->getId)};
my $out = eval{$self->session->cache->get($self->getViewCacheKey)};
return $out if $out;
}
my %var = %{$self->get};
@ -585,7 +585,7 @@ sub view {
$var{fileSize} = formatBytes($self->get("assetSize"));
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->get("cacheTimeout") > 10) {
eval{$self->session->cache->set("view_".$self->getId, $out, $self->get("cacheTimeout"))};
eval{$self->session->cache->set($self->getViewCacheKey, $out, $self->get("cacheTimeout"))};
}
return $out;
}