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

Merge pull request #2042 from gproly/BUG-12494

Browse Source 
BUG-12494 SOLVED
This commit is contained in:
julceslauhub
2013-09-10 13:47:54 -07:00
parent c45067440b fc46da00a7
commit abcd6efd25
1 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1747,33 +1747,36 @@ class G
$arrayGrid = array_unique($arrayGrid);
foreach ($arrayGrid as $index => $value) {
$grdName = $value;
if($value !== "") {
$grdName = $value;
$strContentAux1 = $strContentAux;
$strContentAux = null;
$strContentAux1 = $strContentAux;
$strContentAux = null;
$ereg = "/^(.*)@>" . $grdName . "(.*)@<" . $grdName . "(.*)$/";
$ereg = "/^(.*)@>" . $grdName . "(.*)@<" . $grdName . "(.*)$/";
while (preg_match($ereg, $strContentAux1, $arrayMatch2)) {
$strData = null;
while (preg_match($ereg, $strContentAux1, $arrayMatch2)) {
$strData = null;
if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) {
foreach ($aFields[$grdName] as $aRow) {
foreach ($aRow as $sKey => $vValue) {
if (!is_array($vValue)) {
$aRow[$sKey] = nl2br($aRow[$sKey]);
if (isset($aFields[$grdName]) && is_array($aFields[$grdName])) {
foreach ($aFields[$grdName] as $aRow) {
foreach ($aRow as $sKey => $vValue) {
if (!is_array($vValue)) {
$aRow[$sKey] = nl2br($aRow[$sKey]);
}
}
}
$strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
$strData = $strData . G::replaceDataField($arrayMatch2[2], $aRow);
}
}
$strContentAux1 = $arrayMatch2[1];
$strContentAux = $strData . $arrayMatch2[3] . $strContentAux;
}
$strContentAux1 = $arrayMatch2[1];
$strContentAux = $strData . $arrayMatch2[3] . $strContentAux;
$strContentAux = $strContentAux1 . $strContentAux;
}
$strContentAux = $strContentAux1 . $strContentAux;
}
}