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

Merge pull request #430 from victorsl/BUG-9509

Browse Source 
BUG 9509 "On ProcessMaker 2.0.42 the WYSISWG editor doesn't..." SOLVED
This commit is contained in:
julceslauhub
2012-08-03 15:40:06 -07:00
parent cc2fbad377 e84c194487
commit 02e8ac5fdf
3 changed files with 189 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
workflow/engine/classes/model/OutputDocument.php
View File

@@ -509,8 +509,12 @@ class OutputDocument extends BaseOutputDocument
$aProperties=array()
) {
if (($sUID != '') && is_array($aFields) && ($sPath != '')) {
$sContent = G::unhtmlentities($sContent);
$strContentAux = str_replace(array("\n", "\r", "\t"), array(null, null, null), $sContent);
$nrt = array("\n", "\r", "\t");
$nrthtml = array("(n /)", "(r /)", "(t /)");
$sContent = G::unhtmlentities($sContent);
$strContentAux = str_replace($nrt, $nrthtml, $sContent);
$iOcurrences = preg_match_all('/\@(?:([\>])([a-zA-Z\_]\w*)|([a-zA-Z\_][\w\-\>\:]*)\(((?:[^\\\\\)]*(?:[\\\\][\w\W])?)*)\))((?:\s*\[[\'"]?\w+[\'"]?\])+)?/', $strContentAux, $arrayMatch1, PREG_PATTERN_ORDER | PREG_OFFSET_CAPTURE);
@@ -554,6 +558,8 @@ class OutputDocument extends BaseOutputDocument
}
}
$strContentAux = str_replace($nrthtml, $nrt, $strContentAux);
$sContent = $strContentAux;
foreach ($aFields as $sKey => $vValue) {