Merge branch 'master' of bitbucket.org:colosa/processmaker into CONSOLIDATED

2015-03-25 18:20:07 -04:00
parent 1096a75fd8 beb2a15107
commit c801d0d38f
2 changed files with 14 additions and 7 deletions
--- a/workflow/engine/classes/model/Dynaform.php
+++ b/workflow/engine/classes/model/Dynaform.php
@@ -173,6 +173,9 @@ class Dynaform extends BaseDynaform
            if (isset($aData["DYN_CONTENT"])) {
                $this->setDynContent($aData["DYN_CONTENT"]);
            }
+            if (isset($aData["DYN_LABEL"])) {
+                $this->setDynLabel($aData["DYN_LABEL"]);
+            }
            if (!isset($aData['DYN_VERSION'])) {
                $aData['DYN_VERSION'] = 0;
            }