diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-12 16:20:39 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2007-04-12 16:20:39 +0000 |
| commit | b63745fdb3b775d7505f38ed03a8bb39907a825c (patch) | |
| tree | 3c2bc96535a30d66df3fdf6b3307be469d4362bd /phpBB/includes/acp/acp_groups.php | |
| parent | f0868d37dfd73df6c2dfd76362af6c09b6b49a5f (diff) | |
| download | forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar.gz forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar.bz2 forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.tar.xz forums-b63745fdb3b775d7505f38ed03a8bb39907a825c.zip | |
my take on getting the bugs down... thanks to those also providing (usable) solutions to the problem. ;) Of course also to those reporting generally...
git-svn-id: file:///svn/phpbb/trunk@7330 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/acp/acp_groups.php')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 25 |
1 files changed, 3 insertions, 22 deletions
diff --git a/phpBB/includes/acp/acp_groups.php b/phpBB/includes/acp/acp_groups.php index cbf46a1dc1..29000b2c63 100644 --- a/phpBB/includes/acp/acp_groups.php +++ b/phpBB/includes/acp/acp_groups.php @@ -235,6 +235,8 @@ class acp_groups case 'edit': case 'add': + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + $data = $submit_ary = array(); if ($action == 'edit' && !$group_id) @@ -486,28 +488,7 @@ class acp_groups $type_closed = ($group_type == GROUP_CLOSED) ? ' checked="checked"' : ''; $type_hidden = ($group_type == GROUP_HIDDEN) ? ' checked="checked"' : ''; - if (isset($group_row['group_avatar']) && $group_row['group_avatar']) - { - $avatar_img = ''; - - switch ($group_row['group_avatar_type']) - { - case AVATAR_UPLOAD: - $avatar_img = $phpbb_root_path . $config['avatar_path'] . '/'; - break; - - case AVATAR_GALLERY: - $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; - break; - } - - $avatar_img .= $group_row['group_avatar']; - $avatar_img = '<img src="' . $avatar_img . '" width="' . $group_row['group_avatar_width'] . '" height="' . $group_row['group_avatar_height'] . '" alt="" />'; - } - else - { - $avatar_img = '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />'; - } + $avatar_img = (!empty($group_row['group_avatar'])) ? get_user_avatar($group_row['group_avatar'], $group_row['group_avatar_type'], $group_row['group_avatar_width'], $group_row['group_avatar_height'], 'GROUP_AVATAR') : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />'; $display_gallery = (isset($_POST['display_gallery'])) ? true : false; |