Merge remote-tracking branch 'upstream/3.0.1.6' into 3.0.1.6-Gmail

2015-11-11 15:46:54 -04:00
parent 8115bc9376 34c0fd9fd5
commit 0f5ceaed43
11 changed files with 144 additions and 16 deletions
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -509,6 +509,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();