merging some of the 6.6.4 changes

This commit is contained in:
JT Smith 2005-07-13 02:10:16 +00:00
parent 88d751b64e
commit 85f8ef7f43
8 changed files with 38 additions and 34 deletions

View file

@ -263,8 +263,13 @@ sub page {
$url = getSiteURL();
}
$url .= getScriptURL();
my $pathinfo = $session{env}{PATH_INFO};
$pathinfo =~ s/^\/(.*)/$1/;
my $pathinfo;
if ($session{asset}) {
$pathinfo = $session{asset}->get("url");
} else {
$pathinfo = $session{env}{PATH_INFO};
$pathinfo =~ s/^\/(.*)/$1/;
}
$url .= $pathinfo;
if ($session{setting}{preventProxyCache} == 1 && !$skipPreventProxyCache) {
$url = append($url,"noCache=".randint(0,1000).';'.time());