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

13
lib/WebGUI/Asset/File/ZipArchive.pm
View file

@ -184,8 +184,9 @@ used to show the file to administrators.
sub view {
my $self = shift;
my $cache = $self->session->cache;
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
my $out = eval{$cache->get("view_".$self->getId)};
my $cacheKey = $self->getWwwCacheKey('view');
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
my $out = eval { $cache->get( $cacheKey ) };
return $out if $out;
}
my %var = %{$self->get};
@ -207,10 +208,10 @@ sub view {
$var{noInitialPage} = $i18n->get('noInitialPage');
$var{noFileSpecified} = $i18n->get('noFileSpecified');
my $out = $self->processTemplate(\%var,undef,$self->{_viewTemplate});
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
eval{$cache->set("view_".$self->getId, $out, $self->cacheTimeout)};
}
return $out;
if (!$self->session->var->isAdminOn && $self->cacheTimeout > 10) {
eval{ $cache->set( $cacheKey, $out, $self->cacheTimeout) };
}
return $out;
}