Merge pull request #34 from tbembersimeao/develop

Fixing wrong logic on 2.x - 3.x migration

Author: pbchase

ExternalModule.php

@@ -113,13 +113,16 @@ function redcap_module_system_change_version($version, $old_version) {
                 continue;
             }
 
-            $conds = array_combine(
-                $this->getProjectSetting('instrument_name', $pid),
-                $this->getProjectSetting('control_field_value', $pid)
-            );
+            $forms = $this->getProjectSetting('instrument_name', $pid);
+            $values = $this->getProjectSetting('control_field_value', $pid);
 
             $bl = array();
-            foreach ($conds as $form => $value) {
+            foreach ($forms as $i => $form) {
+                if (empty($form)) {
+                    continue;
+                }
+
+                $value = $values[$i];
                 if (!isset($bl[$value])) {
                     $bl[$value] = array();
                 }