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

merging some of the 6.6.4 changes

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

2
lib/WebGUI/Asset.pm
View file

@ -958,7 +958,7 @@ Creates and returns a tabform to edit parameters of an Asset.
sub getEditForm {
my $self = shift;
my $tabform = WebGUI::TabForm->new(undef,undef,$self->getContainer->getUrl());
my $tabform = WebGUI::TabForm->new(undef,undef,$self->getUrl());
$tabform->hidden({
name=>"func",
value=>"editSave"

2
lib/WebGUI/Asset/Wobject/Layout.pm
View file

@ -191,7 +191,7 @@ sub view {
}
# deal with unplaced children
foreach my $child (@{$children}) {
unless (isIn($child->getId, @found)) {
unless (isIn($child->getId, @found)||isIn($child->getId,@hidden)) {
push(@{$vars{"position1_loop"}},{
id=>$child->getId,
content=>$child->view

4
lib/WebGUI/Session.pm
View file

@ -194,8 +194,8 @@ sub convertVisitorToUser {
if ($session{setting}{passiveProfilingEnabled}) {
WebGUI::SQL->write("update passiveProfileLog set userId = ".quote($_[1])." where sessionId = ".quote($_[0]));
}
undef $session{isInGroup}; # decache some performance enhancers because we're
undef $session{gotGroupsForUser}; # user ids.
delete $session{isInGroup}; # decache some performance enhancers because we're
delete $session{gotGroupsForUser}; # user ids.
$session{var}{userId} = $_[1];
refreshUserInfo($_[1]);
}

9
lib/WebGUI/URL.pm
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());