fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1611 from julceslauhub/master

Browse Source 
BUG 9933 Step conditions evaluating too early IMPROVEMENT
This commit is contained in:
julceslauhub
2013-04-22 10:36:36 -07:00
parent 7fcfc09df0 b4589224f2
commit d4f16e5ed9
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
workflow/engine/classes/class.pmScript.php
View File

@@ -335,9 +335,12 @@ class PMScript
for ($i = 0; $i < $iOcurrences; $i ++) {
// if the variables for that condition has not been previously defined then $variableIsDefined
// is set to false
if (! isset( $this->aFields[$aMatch[2][$i][0]] )) {
// $variableIsDefined = false;
if (!isset($this->aFields[$aMatch[2][$i][0]]) && !isset($aMatch[5][$i][0])) {
$this->aFields[$aMatch[2][$i][0]] = '';
} else {
if (!isset($this->aFields[$aMatch[2][$i][0]])) {
eval("\$this->aFields['" . $aMatch[2][$i][0] . "']" . $aMatch[5][$i][0] . " = '';");
}
}
$sAux = substr( $this->sScript, $iAux, $aMatch[0][$i][1] - $iAux );
if (! $bEqual) {