diff options
| author | Cullen Walsh <ckwalsh@phpbb.com> | 2011-04-17 19:29:28 -0700 |
|---|---|---|
| committer | Cullen Walsh <ckwalsh@cullenwalsh.com> | 2012-03-18 22:19:16 +0000 |
| commit | 4c699e0d0acc0aafab37e36206a92b1919282dac (patch) | |
| tree | 29d852af3836b696b384d338a036e574f5844119 /phpBB/memberlist.php | |
| parent | 1fa39ea722ab8e27402d3db67d5f11587570a96d (diff) | |
| download | forums-4c699e0d0acc0aafab37e36206a92b1919282dac.tar forums-4c699e0d0acc0aafab37e36206a92b1919282dac.tar.gz forums-4c699e0d0acc0aafab37e36206a92b1919282dac.tar.bz2 forums-4c699e0d0acc0aafab37e36206a92b1919282dac.tar.xz forums-4c699e0d0acc0aafab37e36206a92b1919282dac.zip | |
[feature/avatars] Modularized Avatars
A modularized avatar system that easily allows plugins to be created
for various avatar services, such as Gravatar.
This inital commit includes module support and is backwards
compatible with 3.0 avatars, but does notcontain ACP or UCP modules
for manipulating new avatars.
PHPBB3-10018
Diffstat (limited to 'phpBB/memberlist.php')
| -rw-r--r-- | phpBB/memberlist.php | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/phpBB/memberlist.php b/phpBB/memberlist.php index 741ac2f430..a2bac28be3 100644 --- a/phpBB/memberlist.php +++ b/phpBB/memberlist.php @@ -554,7 +554,7 @@ switch ($mode) $member['user_sig'] = smiley_text($member['user_sig']); } - $poster_avatar = get_user_avatar($member['user_avatar'], $member['user_avatar_type'], $member['user_avatar_width'], $member['user_avatar_height']); + $poster_avatar = get_user_avatar($member); // We need to check if the modules 'zebra' ('friends' & 'foes' mode), 'notes' ('user_notes' mode) and 'warn' ('warn_user' mode) are accessible to decide if we can display appropriate links $zebra_enabled = $friends_enabled = $foes_enabled = $user_notes_enabled = $warn_user_enabled = false; @@ -1219,8 +1219,7 @@ switch ($mode) break; } - // Misusing the avatar function for displaying group avatars... - $avatar_img = get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR'); + $avatar_img = get_group_avatar($group_row); $rank_title = $rank_img = $rank_img_src = ''; if ($group_row['group_rank']) @@ -1716,7 +1715,7 @@ function show_profile($data, $user_notes_enabled = false, $warn_user_enabled = f 'A_USERNAME' => addslashes(get_username_string('username', $user_id, $username, $data['user_colour'])), - 'AVATAR_IMG' => get_user_avatar($data['user_avatar'], $data['user_avatar_type'], $data['user_avatar_width'], $data['user_avatar_height']), + 'AVATAR_IMG' => get_user_avatar($data), 'ONLINE_IMG' => (!$config['load_onlinetrack']) ? '' : (($online) ? $user->img('icon_user_online', 'ONLINE') : $user->img('icon_user_offline', 'OFFLINE')), 'S_ONLINE' => ($config['load_onlinetrack'] && $online) ? true : false, 'RANK_IMG' => $rank_img, |