From 4d80c2935ee7e06f4f29d33f8d69c225bf803975 Mon Sep 17 00:00:00 2001
From: Roly Rudy Gutierrez Pinto <gproly@gmail.com>
Date: Mon, 9 Nov 2015 17:27:35 -0400
Subject: [PATCH] PM-3935

---
 workflow/engine/classes/class.pmDynaform.php            | 3 +++
 workflow/engine/src/ProcessMaker/Services/Api/Light.php | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/workflow/engine/classes/class.pmDynaform.php b/workflow/engine/classes/class.pmDynaform.php
index 2e2f76ab9..6c56a9e0d 100644
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -485,6 +485,9 @@ class pmDynaform
 
     private function getValuesDependentFields($json)
     {
+        if (!isset($this->record["DYN_CONTENT"])) {
+            return array();
+        }
         $data = array();
         if (isset($json->dbConnection) && isset($json->sql)) {
             $salida = array();
diff --git a/workflow/engine/src/ProcessMaker/Services/Api/Light.php b/workflow/engine/src/ProcessMaker/Services/Api/Light.php
index 1e7200ddb..f0f94a580 100644
--- a/workflow/engine/src/ProcessMaker/Services/Api/Light.php
+++ b/workflow/engine/src/ProcessMaker/Services/Api/Light.php
@@ -751,11 +751,11 @@ class Light extends Api
             $dynaForm = new \ProcessMaker\BusinessModel\DynaForm();
             $dynaForm->setFormatFieldNameInUppercase(false);
             \G::LoadClass("pmDynaform");
-            $pmDynaForm = new \pmDynaform();
             $_SESSION['PROCESS'] = $prj_uid;
             $return = array();
             foreach ($request_data['formId'] as $dyn_uid) {
                 $response = $dynaForm->getDynaForm($dyn_uid);
+                $pmDynaForm = new \pmDynaform(array("CURRENT_DYNAFORM" => $dyn_uid));
                 $result   = $this->parserDataDynaForm($response);
                 $result['formContent'] = (isset($result['formContent']) && $result['formContent'] != null)?json_decode($result['formContent']):"";
                 $pmDynaForm->jsonr($result['formContent']);