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

Merged in gproly/processmaker (pull request #1390)

Browse Source 
PM-1452 IMPROVEMENT reference value, for php5.4
This commit is contained in:
Julio Cesar Laura Avendaño
2015-02-05 12:29:06 -04:00
parent d9ed1e25a8 6fdf92757f
commit 07fce9f578
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -157,14 +157,14 @@ class pmDynaform
} }
} }
public function mergeDynContentAppData($app_uid, &$items) public function mergeDynContentAppData($app_uid, $items)
{ {
$dynContent = G::json_decode($this->record["DYN_CONTENT"]); $dynContent = G::json_decode($this->record["DYN_CONTENT"]);
if (isset($dynContent->items)) { if (isset($dynContent->items)) {
$this->items = $dynContent->items[0]->items; $this->items = $dynContent->items[0]->items;
} }
$this->mergeAppData($app_uid, &$items); $this->mergeAppData($app_uid, $items);
$dynContent->items[0]->items = $this->items; $dynContent->items[0]->items = $this->items;
$a = G::json_encode($dynContent); $a = G::json_encode($dynContent);