Should fix #1959 BT#12768

pull/2487/head
jmontoyaa 9 years ago
parent 7ab1e77740
commit bd8537963e
  1. 20
      main/auth/profile.php
  2. 7
      main/inc/lib/api.lib.php

@ -96,7 +96,15 @@ $table_user = Database::get_main_table(TABLE_MAIN_USER);
/*
* Get initial values for all fields.
*/
$user_data = api_get_user_info(api_get_user_id());
$user_data = api_get_user_info(
api_get_user_id(),
false,
false,
false,
false,
false,
false
);
$array_list_key = UserManager::get_api_keys(api_get_user_id());
$id_temp_key = UserManager::get_api_key_id(api_get_user_id(), 'dokeos');
$value_array = $array_list_key[$id_temp_key];
@ -691,7 +699,15 @@ if ($form->validate()) {
$extraField = new ExtraFieldValue('user');
$extraField->saveFieldValues($user_data);
$userInfo = api_get_user_info();
$userInfo = api_get_user_info(
api_get_user_id(),
false,
false,
false,
false,
false,
false
);
Session::write('_user', $userInfo);
$url = api_get_self();

@ -1443,6 +1443,8 @@ function _api_format_user($user, $add_password = false, $loadAvatars = true)
* @param bool $loadExtraData
* @param bool $loadOnlyVisibleExtraData Get the user extra fields that are visible
* @param bool $loadAvatars turn off to improve performance and if avatars are not needed.
* @param bool $enableCache if true check the apc cache
*
* @return array $user_info user_id, lastname, firstname, username, email, etc
* @author Patrick Cool <patrick.cool@UGent.be>
* @author Julio Montoya
@ -1454,11 +1456,12 @@ function api_get_user_info(
$showPassword = false,
$loadExtraData = false,
$loadOnlyVisibleExtraData = false,
$loadAvatars = true
$loadAvatars = true,
$enableCache = true
) {
$apcVar = null;
$user = false;
$cacheAvailable = api_get_configuration_value('apc');
$cacheAvailable = api_get_configuration_value('apc') && $enableCache;
if (empty($user_id)) {
$userFromSession = Session::read('_user');

Loading…
Cancel
Save