aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/viewtopic.php
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-10-01 10:19:24 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-10-01 10:19:24 +0200
commit170b75d0c9bab9d7500748c32bc4de93d1bf5c2f (patch)
tree484de5bacc5de90d0b51f0644247931bb9b08fbb /phpBB/viewtopic.php
parent994a0dcd4c444c7902f85355efba3a9a6b06f78e (diff)
parentcd7b21a7033d692b2f558dfd82bb67d3696d9e0e (diff)
downloadforums-170b75d0c9bab9d7500748c32bc4de93d1bf5c2f.tar
forums-170b75d0c9bab9d7500748c32bc4de93d1bf5c2f.tar.gz
forums-170b75d0c9bab9d7500748c32bc4de93d1bf5c2f.tar.bz2
forums-170b75d0c9bab9d7500748c32bc4de93d1bf5c2f.tar.xz
forums-170b75d0c9bab9d7500748c32bc4de93d1bf5c2f.zip
Merge pull request #2888 from Nicofuma/ticket/12993
[ticket/12993] Improve get_user_ranks
Diffstat (limited to 'phpBB/viewtopic.php')
-rw-r--r--phpBB/viewtopic.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/phpBB/viewtopic.php b/phpBB/viewtopic.php
index f8b4a54f05..a340dbe5ad 100644
--- a/phpBB/viewtopic.php
+++ b/phpBB/viewtopic.php
@@ -1203,7 +1203,10 @@ while ($row = $db->sql_fetchrow($result))
$user_cache[$poster_id] = $user_cache_data;
- get_user_rank($row['user_rank'], false, $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']);
+ $user_rank_data = phpbb_get_user_rank($row, false);
+ $user_cache[$poster_id]['rank_title'] = $user_rank_data['title'];
+ $user_cache[$poster_id]['rank_image'] = $user_rank_data['img'];
+ $user_cache[$poster_id]['rank_image_src'] = $user_rank_data['img_src'];
}
else
{
@@ -1267,7 +1270,10 @@ while ($row = $db->sql_fetchrow($result))
$user_cache[$poster_id] = $user_cache_data;
- get_user_rank($row['user_rank'], $row['user_posts'], $user_cache[$poster_id]['rank_title'], $user_cache[$poster_id]['rank_image'], $user_cache[$poster_id]['rank_image_src']);
+ $user_rank_data = phpbb_get_user_rank($row, false);
+ $user_cache[$poster_id]['rank_title'] = $user_rank_data['title'];
+ $user_cache[$poster_id]['rank_image'] = $user_rank_data['img'];
+ $user_cache[$poster_id]['rank_image_src'] = $user_rank_data['img_src'];
if ((!empty($row['user_allow_viewemail']) && $auth->acl_get('u_sendemail')) || $auth->acl_get('a_email'))
{