merging 7.4 changes
This commit is contained in:
parent
5292426cc5
commit
1149fd54ed
19 changed files with 319 additions and 167 deletions
|
|
@ -56,11 +56,11 @@ sub execute {
|
|||
if ($operation->{$op}) {
|
||||
$output = eval { WebGUI::Pluggable::run("WebGUI::Operation::".$operation->{$op}, 'www_'.$op, [ $session ] ) };
|
||||
if ( $@ ) {
|
||||
die $@ if ($@ =~ "^fatal:");
|
||||
$session->errorHandler->error($@);
|
||||
return;
|
||||
}
|
||||
}
|
||||
else {
|
||||
} else {
|
||||
$session->errorHandler->security("execute an invalid operation: ".$op);
|
||||
}
|
||||
return $output;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue