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

allow undef to return from macros, fix empty string returns, test a few more cases

Browse source
This commit is contained in:
Graham Knop 2008-09-16 21:34:48 +00:00
parent 79e88a867a
commit 4f0663f199
4 changed files with 62 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/WebGUI/Macro.pm
View file

@ -123,8 +123,9 @@ sub process {
"Too many levels of macro recursion. Stopping.";
}
else {
my $d = $1;
my $replaceText = _processMacro($session, $2, $3);
defined $replaceText ? $replaceText : $1; # processMacro returns undef on failure, use original text
defined $replaceText ? $replaceText : $d; # processMacro returns undef on failure, use original text
}
}ge;
}
@ -189,6 +190,8 @@ sub _processMacro {
$session->log->error("Unable to process macro '$macroname': $@");
return;
}
$output = ''
if !defined $output;
process($session, \$output); # also need to process macros on output
return $output;
}