Polish #1002 - avoid errors if no groups in play

tbar0970 · Jan 26, 2024 · 491c95e · 491c95e
1 parent 1262dbf
commit 491c95e
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/views/view_10_admin__7_import.class.php b/views/view_10_admin__7_import.class.php
@@ -349,12 +349,13 @@ private function _preparePreview()
 				if (!$this->_haveErrors($i)) {
 					if (isset($this->_sess['person_updates'][$existingPerson->id])) {
 						// a previous import row also matched this same person.
-						// that can be deliberate.
-						// Don't overwrite stuff.
+						// Later rows take precedence over earlier rows, but data should be combined where possible (eg groups).
 						$already_groups = array_get($this->_sess['person_updates'][$existingPerson->id], '_groups', Array());
 						$this->_pushIntoArray($this->_sess['person_updates'][$existingPerson->id], $person_row);
 						$this->_sess['person_updates'][$existingPerson->id] = $person_row;
-						$this->_sess['person_updates'][$existingPerson->id]['_groups'] = array_unique(array_merge($already_groups, $person_row['_groups']));
+						if (!empty($person_row['_groups'])) {
+							$this->_sess['person_updates'][$existingPerson->id]['_groups'] = array_unique(array_merge($already_groups, $person_row['_groups']));
+						}
 
 					} else {
 						$this->_sess['person_updates'][$existingPerson->id] = $person_row;