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/viewtopic.php | |
| 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/viewtopic.php')
| -rw-r--r-- | phpBB/viewtopic.php | 10 |
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')) { |