makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 12:28:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #2294 from PayBas/ticket/12392

Browse source 
[ticket/12392] Include $profile_fields in core.memberlist_view_profile

* PayBas/ticket/12392:
  [ticket/12392] Fix avatar double assignment bug
  [ticket/12392] Include $profile_fields in core.memberlist_view_profile
This commit is contained in:
Joas Schilling 2014-05-04 16:31:46 +02:00
commit 1e66500d2c
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
phpBB/memberlist.php
View file

@ -565,8 +565,6 @@ switch ($mode)
$member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], $parse_flags, true); $member['user_sig'] = generate_text_for_display($member['user_sig'], $member['user_sig_bbcode_uid'], $member['user_sig_bbcode_bitfield'], $parse_flags, true);
} }
$poster_avatar = phpbb_get_user_avatar($member);
// We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links // We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links
$zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false; $zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false;
@ -591,25 +589,31 @@ switch ($mode)
unset($module); unset($module);
} }
// Custom Profile Fields
$profile_fields = array();
if ($config['load_cpf_viewprofile'])
{
$cp = $phpbb_container->get('profilefields.manager');
$profile_fields = $cp->grab_profile_fields_data($user_id);
$profile_fields = (isset($profile_fields[$user_id])) ? $cp->generate_profile_fields_template_data($profile_fields[$user_id]) : array();
}
/** /**
* Modify user data before we display the profile * Modify user data before we display the profile
* *
* @event core.memberlist_view_profile * @event core.memberlist_view_profile
* @var array member Array with user's data * @var array member Array with user's data
* @var bool user_notes_enabled Is the mcp user notes module * @var bool user_notes_enabled Is the mcp user notes module enabled?
* enabled? * @var bool warn_user_enabled Is the mcp warnings module enabled?
* @var bool warn_user_enabled Is the mcp warnings module * @var bool zebra_enabled Is the ucp zebra module enabled?
* enabled? * @var bool friends_enabled Is the ucp friends module enabled?
* @var bool zebra_enabled Is the ucp zebra module * @var bool foes_enabled Is the ucp foes module enabled?
* enabled?
* @var bool friends_enabled Is the ucp friends module
* enabled?
* @var bool foes_enabled Is the ucp foes module
* enabled?
* @var bool friend Is the user friend? * @var bool friend Is the user friend?
* @var bool foe Is the user foe? * @var bool foe Is the user foe?
* @var array profile_fields Array with user's profile field data
* @since 3.1.0-a1 * @since 3.1.0-a1
* @changed 3.1.0-b2 Added friend and foe status * @changed 3.1.0-b2 Added friend and foe status
* @changed 3.1.0-b3 Added profile fields data
*/ */
$vars = array( $vars = array(
'member', 'member',
@ -620,20 +624,12 @@ switch ($mode)
'foes_enabled', 'foes_enabled',
'friend', 'friend',
'foe', 'foe',
'profile_fields',
); );
extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars))); extract($phpbb_dispatcher->trigger_event('core.memberlist_view_profile', compact($vars)));
$template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled)); $template->assign_vars(show_profile($member, $user_notes_enabled, $warn_user_enabled));
// Custom Profile Fields
$profile_fields = array();
if ($config['load_cpf_viewprofile'])
{
$cp = $phpbb_container->get('profilefields.manager');
$profile_fields = $cp->grab_profile_fields_data($user_id);
$profile_fields = (isset($profile_fields[$user_id])) ? $cp->generate_profile_fields_template_data($profile_fields[$user_id]) : array();
}
// If the user has m_approve permission or a_user permission, then list then display unapproved posts // If the user has m_approve permission or a_user permission, then list then display unapproved posts
if ($auth->acl_getf_global('m_approve') || $auth->acl_get('a_user')) if ($auth->acl_getf_global('m_approve') || $auth->acl_get('a_user'))
{ {
@ -659,7 +655,6 @@ switch ($mode)
'SIGNATURE' => $member['user_sig'], 'SIGNATURE' => $member['user_sig'],
'POSTS_IN_QUEUE'=> $member['posts_in_queue'], 'POSTS_IN_QUEUE'=> $member['posts_in_queue'],
'AVATAR_IMG' => $poster_avatar,
'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']), 'PM_IMG' => $user->img('icon_contact_pm', $user->lang['SEND_PRIVATE_MESSAGE']),
'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['EMAIL']), 'EMAIL_IMG' => $user->img('icon_contact_email', $user->lang['EMAIL']),
'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']), 'JABBER_IMG' => $user->img('icon_contact_jabber', $user->lang['JABBER']),