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

PMC-916

Browse Source
This commit is contained in:
Julio Cesar Laura Avendaño
2019-07-01 11:49:26 -04:00
parent 6e9247fdb8
commit e486b40906
14 changed files with 106 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gulliver/system/class.g.php
View File

@@ -1691,7 +1691,7 @@ class G
* @fn() Evaluate string with the function "fn"
* @author David Callizaya <calidavidx21@hotmail.com>
*/
public static function replaceDataField($sqlString, $result, $DBEngine = 'mysql')
public static function replaceDataField($sqlString, $result, $DBEngine = 'mysql', $recursive = true)
{
if (!is_array($result)) {
$result = array();
@@ -1748,12 +1748,12 @@ class G
}
//Non-quoted
if (($match[1][$r][0] == '#') && (isset($result[$match[2][$r][0]]))) {
$__textoEval .= $result[$match[2][$r][0]];
$__textoEval .= $recursive ? G::replaceDataField($result[$match[2][$r][0]], $result) : $result[$match[2][$r][0]];
continue;
}
//Non-quoted =
if (($match[1][$r][0] == '=') && (isset($result[$match[2][$r][0]]))) {
$__textoEval .= $result[$match[2][$r][0]];
$__textoEval .= $recursive ? G::replaceDataField($result[$match[2][$r][0]], $result) : $result[$match[2][$r][0]];
continue;
}
//Objects attributes
@@ -1826,7 +1826,7 @@ class G
}
}
}
$strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
$strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow, 'mysql', false);
}
}
@@ -1851,7 +1851,7 @@ class G
}
}
$sContent = G::replaceDataField($sContent, $aFields);
$sContent = G::replaceDataField($sContent, $aFields, 'mysql', false);
return $sContent;
}