Merge branch 'release/3.3.4'

AUTHORS.md

@@ -6,4 +6,4 @@ David R Nelson, Director of the University of Florida Clinical Translational Sci
 
 The authors would like to thank Teddy S. Youn, MD and Katharina Busl, M.D., M.S. of the Division of Neurocritical Care at University of Florida for the concepts behind the creation of this software and the funding to write it. Andy Martin named it.
 
-We want to thank our developers Dileep Rajput [email protected], Stewart Wehmeyer [email protected], Sreeja Kannagundla [email protected], Surya Prasanna [email protected], Prasad Lanka [email protected], Taryn Stoffs [email protected], and Philip Chase [email protected] for their contributions to the project.
+We want to thank our developers Tiago Bember [email protected], Marly Cormar [email protected], Dileep Rajput [email protected], Stewart Wehmeyer [email protected], Sreeja Kannagundla [email protected], Surya Prasanna [email protected], Prasad Lanka [email protected], Taryn Stoffs [email protected], and Philip Chase [email protected] for their contributions to the project.

CHANGELOG.md

@@ -2,6 +2,12 @@
 All notable changes to the Form Render Skip Logic module will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [3.3.4] - 2018-12-12
+### Changed
+- Move authors from config.json to authors.md and add Marly as an author (Philip Chase)
+- Preventing "Unsupported operands types" error (tbembersimeao)
+
+
 ## [3.3.3] - 2018-08-16
 ### Changed
 - Fixing wrong behavior of "Control mode" field on config form: part II. (Tiago Bember Simeao)

ExternalModule.php

@@ -303,6 +303,10 @@ function getFormsAccessMatrix($event_id = null, $record = null) {
 
                         $logic = Calculate::formatCalcToPHP($logic, $Proj);
                         $logic = LogicTester::logicPrependEventName($logic, $events_names[$event_id]);
+
+                        if (empty($data[$event_id])) {
+                            $data[$event_id] = array();
+                        }
 
                         $data[$event_id] += array($fake_field => '');
                         $controls[$i]['value'] = (string) LogicTester::evaluateCondition($logic, $data);

config.json

@@ -22,23 +22,8 @@
             "institution": "University of Florida - CTSI"
         },
         {
-            "name": "Prasad Lanka",
-            "email": "[email protected]",
-            "institution": "University of Florida - CTSI"
-        },
-        {
-            "name": "Surya Prasanna",
-            "email": "[email protected]",
-            "institution": "University of Florida - CTSI"
-        },
-        {
-            "name": "Dileep Rajput",
-            "email": "[email protected]",
-            "institution": "University of Florida - CTSI"
-        },
-        {
-            "name": "Stewart Wehmeyer",
-            "email": "[email protected]",
+            "name": "Marly Cormar",
+            "email": "[email protected]",
             "institution": "University of Florida - CTSI"
         },
         {