merging 6.7.8 changes

This commit is contained in:
JT Smith 2005-10-18 23:12:36 +00:00
parent d2f6f887f3
commit 25af8fb98b
3 changed files with 4 additions and 2 deletions

View file

@ -151,8 +151,8 @@ sub process {
$params =~ s/(^\(|\)$)//g; # remove parenthesis
$params = &process($params); # recursive process params
}
if ($session{config}{macros}{$searchString} ne "") {
my $cmd = "WebGUI::Macro::".$session{config}{macros}{$searchString};
if ($WebGUI::Session::session{config}{macros}{$searchString} ne "") {
my $cmd = "WebGUI::Macro::".$WebGUI::Session::session{config}{macros}{$searchString};
my $load = "use ".$cmd;
eval($load);
WebGUI::ErrorHandler::error("Macro failed to compile: $cmd.".$@) if($@);