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

Fixed bug 640486 and redirect pages now preprocess macros on the URL before redirecting.

Browse source
This commit is contained in:
JT Smith 2002-11-25 16:39:15 +00:00
parent b0cfcfe0ba
commit bcda4ebb01
1 changed files with 6 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

11
lib/WebGUI.pm
View file

@ -16,6 +16,7 @@ use Tie::CPHash;
use WebGUI::ErrorHandler; use WebGUI::ErrorHandler;
use WebGUI::Icon; use WebGUI::Icon;
use WebGUI::International; use WebGUI::International;
use WebGUI::Macro;
use WebGUI::Operation; use WebGUI::Operation;
use WebGUI::Privilege; use WebGUI::Privilege;
use WebGUI::Session; use WebGUI::Session;
@ -232,16 +233,16 @@ sub page {
$httpHeader = WebGUI::Session::httpHeader(); $httpHeader = WebGUI::Session::httpHeader();
WebGUI::Session::close(); WebGUI::Session::close();
return $httpHeader.$operationOutput.$wobjectOutput; return $httpHeader.$operationOutput.$wobjectOutput;
} elsif ($operationOutput ne "") {
$positions->{"template.position".1} = $operationOutput;
} elsif ($session{page}{redirectURL}) { } elsif ($session{page}{redirectURL}) {
$httpHeader = WebGUI::Session::httpRedirect($session{page}{redirectURL}); $httpHeader = WebGUI::Session::httpRedirect(WebGUI::Macro::process($session{page}{redirectURL}));
WebGUI::Session::close(); WebGUI::Session::close();
return $httpHeader; return $httpHeader;
} elsif ($session{header}{redirect} ne "") { } elsif ($session{header}{redirect} ne "") {
$httpHeader = $session{header}{redirect}; $httpHeader = $session{header}{redirect};
WebGUI::Session::close(); WebGUI::Session::close();
return $httpHeader; return $httpHeader;
} elsif ($operationOutput ne "") {
$positions->{"template.position".1} = $operationOutput;
} elsif ($wobjectOutput ne "") { } elsif ($wobjectOutput ne "") {
$positions->{"template.position".1} = $wobjectOutput; $positions->{"template.position".1} = $wobjectOutput;
} else { } else {