From a937bd8a342f7f567c81788307ac8d2cf1da7cbf Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 10 Apr 2019 15:05:45 +0200
Subject: [PATCH] Fix php warning (from ofaj_dev)

---
 main/user/user.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/main/user/user.php b/main/user/user.php
index d541b2fb99..c6f963b0b1 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -889,15 +889,26 @@ function get_user_data($from, $number_of_items, $column, $direction)
 
                 // Active
                 $temp[] = $o_course_user['active'];
+                $extraFieldOption = new ExtraFieldOption('user');
+                $extraFieldValue = new ExtraFieldValue('user');
 
                 if (!empty($extraFields)) {
                     foreach ($extraFields as $extraField) {
-                        $extraFieldValue = new ExtraFieldValue('user');
                         $data = $extraFieldValue->get_values_by_handler_and_field_id(
                             $user_id,
                             $extraField['id']
                         );
-                        $temp[] = $data['value'];
+
+                        $optionList = $extraFieldOption->get_field_option_by_field_and_option(
+                            $extraField['id'],
+                            $data['value']
+                        );
+                        if (!empty($optionList)) {
+                            $options = implode(', ', array_column($optionList, 'display_text'));
+                            $temp[] = $options;
+                        } else {
+                            $temp[] = $data['value'];
+                        }
                     }
                 }