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

BUG 7210 Adjustment Variables cast prefix to consults sql in dynaforms items.

Browse Source
This commit is contained in:
Hector Cortez
2011-08-19 15:42:32 -04:00
parent be548a3e31
commit e1b9029039
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1866,8 +1866,7 @@ $output = $outputHeader.$output;
$__textoEval = ""; $__textoEval = "";
$u = 0; $u = 0;
//$count=preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE); //$count=preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
$count = preg_match_all('/\@(?:([\@\%\#\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE); $count = preg_match_all('/\@(?:([\@\%\#\=\!Qq])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*?)*)\))/',$sqlString,$match,PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
if ($count) { if ($count) {
for($r=0;$r<$count;$r++) { for($r=0;$r<$count;$r++) {
if (!isset($result[$match[2][$r][0]])) if (!isset($result[$match[2][$r][0]]))
@@ -1903,6 +1902,10 @@ $output = $outputHeader.$output;
if (($match[1][$r][0]=='#')&&(isset($result[$match[2][$r][0]]))) { if (($match[1][$r][0]=='#')&&(isset($result[$match[2][$r][0]]))) {
$__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);continue; $__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);continue;
} }
//Non-quoted =
if (($match[1][$r][0]=='=')&&(isset($result[$match[2][$r][0]]))) {
$__textoEval.=G::replaceDataField($result[$match[2][$r][0]],$result);continue;
}
} }
} }
} }