Minor - format code, edit comment, fix php warning

pull/3190/head
Julio Montoya 6 years ago
parent a640452608
commit f9834478b7
  1. 4
      main/inc/lib/api.lib.php
  2. 2
      main/install/configuration.dist.php
  3. 21
      main/user/user.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']) : '';
}
/**

@ -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

@ -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'];
}
}
}
}

Loading…
Cancel
Save