From 3aa67e4d3c16883cea545a96aef7dc0a0d6e8a65 Mon Sep 17 00:00:00 2001 From: Arthur Schiwon Date: Fri, 22 Oct 2021 22:03:29 +0200 Subject: [PATCH] fix populating account array with missing default values - both $userData and $defaultUserData have numeric indices - each element contains at least the name and other fields - appending the missing data array is sufficient Signed-off-by: Arthur Schiwon --- lib/private/Accounts/AccountManager.php | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/lib/private/Accounts/AccountManager.php b/lib/private/Accounts/AccountManager.php index 3416db56ba562..cc22b799e840c 100644 --- a/lib/private/Accounts/AccountManager.php +++ b/lib/private/Accounts/AccountManager.php @@ -473,15 +473,11 @@ protected function sendEmailVerificationEmail(IUser $user, string $email): bool * Make sure that all expected data are set */ protected function addMissingDefaultValues(array $userData, array $defaultUserData): array { - foreach ($defaultUserData as $i => $value) { - // If property doesn't exists, initialize it - if (!array_key_exists($i, $userData)) { - $userData[$i] = []; + foreach ($defaultUserData as $defaultDataItem) { + // If property does not exist, initialize it + if (!array_key_exists($defaultDataItem['name'], $userData)) { + $userData[] = $defaultDataItem; } - - // Merge and extend default missing values - $defaultValueIndex = array_search($value['name'], array_column($defaultUserData, 'name')); - $userData[$i] = array_merge($defaultUserData[$defaultValueIndex], $userData[$i]); } return $userData;