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 | |
| 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')
| -rw-r--r-- | phpBB/includes/acp/acp_groups.php | 25 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_modules.php | 4 | ||||
| -rw-r--r-- | phpBB/includes/acp/acp_users.php | 25 |
3 files changed, 10 insertions, 44 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; diff --git a/phpBB/includes/acp/acp_modules.php b/phpBB/includes/acp/acp_modules.php index 585549fb99..8b54589707 100644 --- a/phpBB/includes/acp/acp_modules.php +++ b/phpBB/includes/acp/acp_modules.php @@ -741,6 +741,10 @@ class acp_modules trigger_error($user->lang['PARENT_NO_EXIST'] . adm_back_link($this->u_action . '&parent_id=' . $this->parent_id), E_USER_WARNING); } + // Workaround + $row['left_id'] = (int) $row['left_id']; + $row['right_id'] = (int) $row['right_id']; + $sql = 'UPDATE ' . MODULES_TABLE . " SET left_id = left_id + 2, right_id = right_id + 2 WHERE module_class = '" . $db->sql_escape($module_data['module_class']) . "' diff --git a/phpBB/includes/acp/acp_users.php b/phpBB/includes/acp/acp_users.php index 54fa34677e..7312dd3bf0 100644 --- a/phpBB/includes/acp/acp_users.php +++ b/phpBB/includes/acp/acp_users.php @@ -1336,6 +1336,8 @@ class acp_users case 'avatar': + include($phpbb_root_path . 'includes/functions_display.' . $phpEx); + $can_upload = (file_exists($phpbb_root_path . $config['avatar_path']) && is_writeable($phpbb_root_path . $config['avatar_path']) && $file_uploads) ? true : false; if ($submit) @@ -1350,28 +1352,7 @@ class acp_users } // Generate users avatar - if ($user_row['user_avatar']) - { - $avatar_img = ''; - - switch ($user_row['user_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 .= $user_row['user_avatar']; - $avatar_img = '<img src="' . $avatar_img . '" width="' . $user_row['user_avatar_width'] . '" height="' . $user_row['user_avatar_height'] . '" alt="" />'; - } - else - { - $avatar_img = '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />'; - } + $avatar_img = ($user_row['user_avatar']) ? get_user_avatar($user_row['user_avatar'], $user_row['user_avatar_type'], $user_row['user_avatar_width'], $user_row['user_avatar_height']) : '<img src="' . $phpbb_admin_path . 'images/no_avatar.gif" alt="" />'; $display_gallery = (isset($_POST['display_gallery'])) ? true : false; $avatar_select = basename(request_var('avatar_select', '')); |