Merged in dheeyi/processmaker/pm1 (pull request #2505)

Pm1
2015-07-24 10:29:08 -04:00
parent 3f02a470ed 6c15ae66ea
commit f1e3514f5c
16 changed files with 236 additions and 139 deletions
--- a/workflow/engine/classes/class.pmDynaform.php
+++ b/workflow/engine/classes/class.pmDynaform.php
@@ -177,7 +177,7 @@ class pmDynaform
                                array_push($json->optionsSql, $option);
                            }
                        } catch (Exception $e) {
-                            
+
                        }
                    }
                    if (isset($json->options[0])) {