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

Merge remote branch 'upstream/master' into BUG-9508

Browse Source
This commit is contained in:
Brayan Osmar Pereyra Suxo
2012-10-03 11:59:46 -04:00
parent ae11d5c106 4753d4d29e
commit e175087c82
25 changed files with 857 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
workflow/engine/classes/class.case.php
View File

@@ -4585,9 +4585,9 @@ class Cases
throw (new Exception("Template file \"$fileTemplate\" does not exist."));
}
$sBody = G::replaceDataField(file_get_contents($fileTemplate), $aFields);
$sBody = G::replaceDataGridField(file_get_contents($fileTemplate), $aFields);
} else {
$sBody = nl2br(G::replaceDataField($aTaskInfo["TAS_DEF_MESSAGE"], $aFields));
$sBody = nl2br(G::replaceDataGridField($aTaskInfo["TAS_DEF_MESSAGE"], $aFields));
}
G::LoadClass("tasks");

13
workflow/engine/classes/model/Content.php
View File

@@ -276,7 +276,7 @@ class Content extends BaseContent {
*
* @param array $langs
*/
function regenerateContent($langId)
function regenerateContent($langs)
{
//Search the language
$key = array_search('en',$langs);
@@ -382,6 +382,17 @@ class Content extends BaseContent {
}
}
function fastInsertContent ($ConCategory, $ConParent, $ConId, $ConLang, $ConValue) {
$con = new Content ( );
$con->setConCategory ( $ConCategory );
$con->setConParent ( $ConParent );
$con->setConId ( $ConId );
$con->setConLang ( $ConLang );
$con->setConValue ( $ConValue );
$res = $con->save ();
return $res;
}
function removeLanguageContent($lanId) {
try {
$c = new Criteria ( );