Merge pull request #6366 from christianbeeznest/fixes-updates96

Internal: Fix undefined variable and null access issues in SocialController

Author: christianbeeznest

src/CoreBundle/Controller/SocialController.php

@@ -479,12 +479,15 @@ public function getUserProfile(
     ): JsonResponse {
         $user = $userRepository->find($userId);
         if (!$user) {
-            return $this->createNotFoundException('User not found');
+            throw $this->createNotFoundException('User not found');
         }
 
         $baseUrl = $requestStack->getCurrentRequest()->getBaseUrl();
         $profileFieldsVisibilityJson = $settingsManager->getSetting('profile.profile_fields_visibility');
-        $profileFieldsVisibility = json_decode($profileFieldsVisibilityJson, true)['options'] ?? [];
+        $decoded = json_decode($profileFieldsVisibilityJson, true);
+        $profileFieldsVisibility = (is_array($decoded) && isset($decoded['options']))
+            ? $decoded['options']
+            : [];
 
         $vCardUserLink = $profileFieldsVisibility['vcard'] ?? true ? $baseUrl.'/main/social/vcard_export.php?userId='.(int) $userId : '';
 
@@ -529,7 +532,10 @@ private function getExtraFieldBlock(
         }
 
         $fieldVisibilityConfig = $settingsManager->getSetting('profile.profile_fields_visibility');
-        $fieldVisibility = ($fieldVisibilityConfig && 'false' !== $fieldVisibilityConfig) ? json_decode($fieldVisibilityConfig, true)['options'] : [];
+        $decoded = json_decode($fieldVisibilityConfig, true);
+        $fieldVisibility = (is_array($decoded) && isset($decoded['options']))
+            ? $decoded['options']
+            : [];
 
         $extraUserData = $userRepository->getExtraUserData($userId);
         $extraFieldsFormatted = [];