Show Area extra field in admin view - refs BT#9413

main/inc/lib/api.lib.php

@@ -1433,6 +1433,10 @@ function _api_format_user($user, $add_password = false)
 
     $result['profile_url'] = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$user_id;
 
+    if (isset($user['extra'])) {
+        $result['extra'] = $user['extra'];
+    }
+
     return $result;
 }
 
@@ -1487,13 +1491,15 @@ function api_get_user_info(
                 }
             }
             $result_array['user_is_online_in_chat'] = $user_online_in_chat;
-            if ($loadExtraData) {
-                $extraFieldValues = new ExtraFieldValue('user');
-                $values = $extraFieldValues->getAllValuesByItem($user_id);
-                if (!empty($values)) {
-                    foreach ($values as $value) {
-                        $result_array['extra'][$value['variable']] = $value['value'];
-                    }
+        }
+
+        if ($loadExtraData) {
+            $extraFieldValues = new ExtraFieldValue('user');
+            $values = $extraFieldValues->getAllValuesByItem($user_id);
+
+            if (!empty($values)) {
+                foreach ($values as $value) {
+                    $result_array['extra'][$value['variable']] = $value['value'];
                 }
             }
         }

plugin/advanced_subscription/src/admin_view.php

@@ -68,7 +68,7 @@ if (!empty($sessionId)) {
         $studentId = intval($student['user_id']);
         $data['studentUserId'] = $studentId;
 
-        $student['area'] = api_get_user_info($studentId)['extra']['area'];
+        $student['area'] = api_get_user_info($studentId, false, false, true)['extra']['area'];
         $student['userLink'] = api_get_path(WEB_CODE_PATH).'social/profile.php?u='.$studentId;
         $data['queueId'] = intval($student['queue_id']);
         $data['newStatus'] = ADVANCED_SUBSCRIPTION_QUEUE_STATUS_ADMIN_APPROVED;