diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-26 14:55:18 +0000 |
| commit | 6583f90b8d082096ebd9cfc0588730dd36efb077 (patch) | |
| tree | 36d01de359aafeabe6daa571ea2c0a40da41ab14 /phpBB/includes/ucp/ucp_groups.php | |
| parent | 5c5330c29d3e19eab804d9dbfd0261e6459e00b8 (diff) | |
| download | forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.gz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.bz2 forums-6583f90b8d082096ebd9cfc0588730dd36efb077.tar.xz forums-6583f90b8d082096ebd9cfc0588730dd36efb077.zip | |
- bug fixes for #5618, #5588 and #5584
- remove messenger->reset() calls (they are already performed on sending)
git-svn-id: file:///svn/phpbb/trunk@6660 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp/ucp_groups.php')
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index e4a38f2b04..1536411e9d 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -196,7 +196,6 @@ class ucp_groups ); $messenger->send($row['user_notify_type']); - $messenger->reset(); } $db->sql_freeresult($result); @@ -575,6 +574,8 @@ class ucp_groups if (isset($group_row['group_avatar']) && $group_row['group_avatar']) { + $avatar_img = ''; + switch ($group_row['group_avatar_type']) { case AVATAR_UPLOAD: @@ -585,8 +586,8 @@ class ucp_groups $avatar_img = $phpbb_root_path . $config['avatar_gallery_path'] . '/'; break; } - $avatar_img .= $group_row['group_avatar']; + $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 |