zero cache pages and a few fixes
This commit is contained in:
parent
e88270b949
commit
dc0cf40f9e
4 changed files with 6 additions and 19 deletions
|
|
@ -19,6 +19,9 @@
|
|||
usernames in the database. (Thanks to Martin Kamerbeek.)
|
||||
- Fixed a bug in the 5.4.3-5.4.4 upgrade script that some users experienced
|
||||
with null values in their DataForm.
|
||||
- If the Cache Timeout on a given page is set to 10 seconds or less, that
|
||||
page will not be cached.
|
||||
|
||||
|
||||
5.4.4
|
||||
- Updated Finnish translation. (Thanks to Markus Hynna.)
|
||||
|
|
|
|||
|
|
@ -39,12 +39,6 @@ my $macros = $conf->get("macros");
|
|||
delete $macros->{"\\"};
|
||||
$macros->{"\\\\"} = "Backslash_pageUrl";
|
||||
$conf->set("macros"=>$macros);
|
||||
my $wobjects = $conf->get("wobjects");
|
||||
my @newWobjects = qw(SOAPClient);
|
||||
foreach (@{$wobjects}) {
|
||||
push(@newWobjects, $_);
|
||||
}
|
||||
$conf->set("wobjects"=>\@newWobjects);
|
||||
$conf->set("searchAndReplace"=>undef);
|
||||
$conf->write;
|
||||
|
||||
|
|
|
|||
|
|
@ -70,15 +70,3 @@ macros = a => a_account, \
|
|||
T => T_topMenuVertical, \
|
||||
u => u_companyUrl
|
||||
|
||||
searchAndReplace = \
|
||||
:) => "<img src='/extras/smileys/smile01.gif' align='absMiddle' border='0'>", \
|
||||
:-) => "<img src='/extras/smileys/smile01.gif' align='absMiddle' border='0'>", \
|
||||
:( => "<img src='/extras/smileys/smile02.gif' align='absMiddle' border='0'>", \
|
||||
:-( => "<img src='/extras/smileys/smile02.gif' align='absMiddle' border='0'>", \
|
||||
;) => "<img src='/extras/smileys/smile03.gif' align='absMiddle' border='0'>", \
|
||||
;-) => "<img src='/extras/smileys/smile03.gif' align='absMiddle' border='0'>", \
|
||||
:D => "<img src='/extras/smileys/smile04.gif' align='absMiddle' border='0'>", \
|
||||
:p => "<img src='/extras/smileys/smile09.gif' align='absMiddle' border='0'>", \
|
||||
:O => "<img src='/extras/smileys/smile11.gif' align='absMiddle' border='0'>", \
|
||||
WebGUI => "<a href='http://www.plainblack.com/webgui'>WebGUI</a>"
|
||||
|
||||
|
|
|
|||
|
|
@ -225,7 +225,9 @@ sub _processOperations {
|
|||
sub page {
|
||||
my ($cache, $debug, $positions, $wobjectOutput, $pageEdit, $httpHeader, $content, $operationOutput, $template);
|
||||
WebGUI::Session::open($_[0],$_[1]);
|
||||
my $useCache = ($session{form}{op} eq "" && $session{form}{wid} eq "" && $session{form}{makePrintable} eq "" && not $session{var}{adminOn});
|
||||
my $useCache = ($session{form}{op} eq "" && $session{form}{wid} eq "" && $session{form}{makePrintable} eq ""
|
||||
&& (($session{page}{cacheTimeout} > 10 && $session{user}{userId} !=1) || ($session{page}{cacheTimeout} > 10 && $session{user}{userId} == 1))
|
||||
&& not $session{var}{adminOn});
|
||||
if ($useCache) {
|
||||
$cache = WebGUI::Cache->new("page_".$session{page}{pageId}."_".$session{user}{userId});
|
||||
$content = $cache->get;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue