diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-10-01 10:19:39 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-10-01 10:19:39 +0200 |
| commit | d73194a415ea2c3c74bdb1efeabe932da9a770c2 (patch) | |
| tree | 1f82b1d5e9469455d1c1fd0eae9058df01c09f29 /phpBB/includes/ucp | |
| parent | 9ad7eddc25f7df6e6cc988d8ceb776b8947ac3a0 (diff) | |
| parent | 170b75d0c9bab9d7500748c32bc4de93d1bf5c2f (diff) | |
| download | forums-d73194a415ea2c3c74bdb1efeabe932da9a770c2.tar forums-d73194a415ea2c3c74bdb1efeabe932da9a770c2.tar.gz forums-d73194a415ea2c3c74bdb1efeabe932da9a770c2.tar.bz2 forums-d73194a415ea2c3c74bdb1efeabe932da9a770c2.tar.xz forums-d73194a415ea2c3c74bdb1efeabe932da9a770c2.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_pm_viewmessage.php | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_pm_viewmessage.php b/phpBB/includes/ucp/ucp_pm_viewmessage.php index d5a1dbae87..2f34fd64a5 100644 --- a/phpBB/includes/ucp/ucp_pm_viewmessage.php +++ b/phpBB/includes/ucp/ucp_pm_viewmessage.php @@ -403,12 +403,15 @@ function get_user_information($user_id, $user_row) $user_row['avatar'] = ($user->optionget('viewavatars')) ? phpbb_get_user_avatar($user_row) : ''; - if (!function_exists('get_user_rank')) + if (!function_exists('phpbb_get_user_rank')) { include($phpbb_root_path . 'includes/functions_display.' . $phpEx); } - get_user_rank($user_row['user_rank'], $user_row['user_posts'], $user_row['rank_title'], $user_row['rank_image'], $user_row['rank_image_src']); + $user_rank_data = phpbb_get_user_rank($user_row, $user_row['user_posts']); + $user_row['rank_title'] = $user_rank_data['title']; + $user_row['rank_image'] = $user_rank_data['img']; + $user_row['rank_image_src'] = $user_rank_data['img_src']; if ((!empty($user_row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email')) { |