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/phpbb | |
| 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/phpbb')
| -rw-r--r-- | phpBB/phpbb/user_loader.php | 7 |
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; } |