diff options
Diffstat (limited to 'phpBB/memberlist.php')
-rw-r--r-- | phpBB/memberlist.php | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index be316d0b19..254cd88625 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -154,6 +154,8 @@ switch ($mode) unset($row); + + // TODO // Which forums does this user have an enabled post count? // Really auth should be handling this capability ... $post_count_sql = array(); @@ -172,6 +174,7 @@ switch ($mode) + // Grab all the relevant data $sql = "SELECT COUNT(p.post_id) AS num_posts FROM " . POSTS_TABLE . " p, " . FORUMS_TABLE . " f @@ -254,7 +257,7 @@ switch ($mode) } $poster_avatar .= $member['user_avatar']; - $poster_avatar = '<img src="' . $poster_avatar . '" width="' . $row['user_avatar_width'] . '" height="' . $row['user_avatar_height'] . '" border="0" alt="" />'; + $poster_avatar = '<img src="' . $poster_avatar . '" width="' . $member['user_avatar_width'] . '" height="' . $member['user_avatar_height'] . '" border="0" alt="" />'; } $template->assign_vars(show_profile($member)); @@ -713,17 +716,9 @@ function show_profile($data) $rank_title = $rank_img = ''; foreach ($ranksrow as $rank) { - if (empty($data['user_rank']) && $data['user_posts'] >= $rank['rank_min']) - { - $rank_title = $rank['rank_title']; - $rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $rank['rank_image'] . '" border="0" alt="' . $rank_title . '" title="' . $rank_title . '" /><br />' : ''; - break; - } - - if (!empty($rank['rank_special']) && $data['user_rank'] == $rank['rank_id']) + if ((empty($rank['rank_special']) && empty($data['user_rank']) && $data['user_posts'] >= $rank['rank_min']) || (!empty($rank['rank_special']) && $data['user_rank'] == $rank['rank_id'])) { - $rank_title = $rank['rank_title']; - $rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $rank['rank_image'] . '" border="0" alt="' . $rank_title . '" title="' . $rank_title . '" /><br />' : ''; + $rank_img = (!empty($rank['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $rank['rank_image'] . '" border="0" alt="' . $rank['rank_title'] . '" title="' . $rank['rank_title'] . '" /><br />' : ''; break; } } |