aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
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/phpbb
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/phpbb')
-rw-r--r--phpBB/phpbb/user_loader.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/phpBB/phpbb/user_loader.php b/phpBB/phpbb/user_loader.php
index c9707ee432..24e663b150 100644
--- a/phpBB/phpbb/user_loader.php
+++ b/phpBB/phpbb/user_loader.php
@@ -212,7 +212,7 @@ class user_loader
return '';
}
- if (!function_exists('get_user_rank'))
+ if (!function_exists('phpbb_get_user_rank'))
{
include($this->phpbb_root_path . 'includes/functions_display.' . $this->php_ext);
}
@@ -223,7 +223,10 @@ class user_loader
'rank_img_src',
);
- get_user_rank($user['user_rank'], (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']), $rank['rank_title'], $rank['rank_img'], $rank['rank_img_src']);
+ $user_rank_data = phpbb_get_user_rank($user, (($user['user_id'] == ANONYMOUS) ? false : $user['user_posts']));
+ $rank['rank_title'] = $user_rank_data['title'];
+ $rank['rank_img'] = $user_rank_data['img'];
+ $rank['rank_img_src'] = $user_rank_data['img_src'];
return $rank;
}