From f9834478b7b8ae6fed615feea435c2bdcfbc28e2 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Wed, 15 Apr 2020 10:17:26 +0200
Subject: [PATCH] Minor - format code, edit comment, fix php warning

---
 main/inc/lib/api.lib.php            |  4 +---
 main/install/configuration.dist.php |  2 +-
 main/user/user.php                  | 21 +++++++++++----------
 3 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/main/inc/lib/api.lib.php b/main/inc/lib/api.lib.php
index 4d2a15932e..140ef28ca1 100644
--- a/main/inc/lib/api.lib.php
+++ b/main/inc/lib/api.lib.php
@@ -8587,9 +8587,7 @@ function convert_double_quote_to_single($in_text)
  */
 function api_get_origin()
 {
-    $origin = isset($_REQUEST['origin']) ? Security::remove_XSS($_REQUEST['origin']) : '';
-
-    return $origin;
+    return isset($_REQUEST['origin']) ? Security::remove_XSS($_REQUEST['origin']) : '';
 }
 
 /**
diff --git a/main/install/configuration.dist.php b/main/install/configuration.dist.php
index 65d62b8005..f018d33e24 100755
--- a/main/install/configuration.dist.php
+++ b/main/install/configuration.dist.php
@@ -1030,7 +1030,7 @@ VALUES (2, 13, 'session_courses_read_only_mode', 'Lock Course In Session', 1, 1,
 // Block student publication add documents BT#14986
 //$_configuration['block_student_publication_add_documents'] = false;
 
-// Block student publication score edition BT#14987
+// Block teacher to modify a work score edition BT#14987
 // $_configuration['block_student_publication_score_edition'] = false;
 
 // Enable system to manage e-mail templates in users registration forms
diff --git a/main/user/user.php b/main/user/user.php
index 026127f149..1aa6b2c598 100755
--- a/main/user/user.php
+++ b/main/user/user.php
@@ -909,16 +909,17 @@ function get_user_data($from, $number_of_items, $column, $direction)
                             $user_id,
                             $extraField['id']
                         );
-
-                        $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'];
+                        if (isset($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'];
+                            }
                         }
                     }
                 }