diff --git a/workflow/engine/classes/class.derivation.php b/workflow/engine/classes/class.derivation.php index 794ab8742..681ed9252 100755 --- a/workflow/engine/classes/class.derivation.php +++ b/workflow/engine/classes/class.derivation.php @@ -195,7 +195,11 @@ class Derivation $pmScript = new PMScript(); $pmScript->setFields($arrayApplicationData["APP_DATA"]); - $pmScript->setScript($arrayRouteData["ROU_CONDITION"]); + if(preg_match('/\b(or|and|xor)\b/i' , $arrayRouteData["ROU_CONDITION"])) { + $pmScript->setScript("( ".$arrayRouteData["ROU_CONDITION"]." )"); + } else { + $pmScript->setScript($arrayRouteData["ROU_CONDITION"]); + } $flagContinue = $pmScript->evaluate(); }