Merge remote-tracking branch 'upstream/3.0.1.8' into 3.0.1.7-Gmail

2016-02-25 16:01:05 -04:00
parent 5c639aff25 abdc846944
commit db83764021
5 changed files with 166 additions and 46 deletions
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -139,7 +139,7 @@ class pmDynaform
            if (!$sw1 && !$sw2) {
                //read event
                $fn = $this->onPropertyRead;
-                if (function_exists($fn)) {
+                if (is_callable($fn) || function_exists($fn)) {
                    $fn($json, $key, $value);
                }
                //set properties from trigger