Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/10965] Profile data is only grabbed when show_novalue is enabled
This commit is contained in:
Andreas Fischer 2012-07-23 23:40:09 +02:00
commit f6b4aec9d0

View file

@ -468,8 +468,11 @@ class custom_profile
foreach ($user_ids as $user_id)
{
$user_fields[$user_id][$used_ident]['value'] = '';
$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
if (!isset($user_fields[$user_id][$used_ident]) && $this->profile_cache[$used_ident]['field_show_novalue'])
{
$user_fields[$user_id][$used_ident]['value'] = '';
$user_fields[$user_id][$used_ident]['data'] = $this->profile_cache[$used_ident];
}
}
}