diff options
| author | Henry Sudhof <kellanved@phpbb.com> | 2008-11-21 13:46:39 +0000 |
|---|---|---|
| committer | Henry Sudhof <kellanved@phpbb.com> | 2008-11-21 13:46:39 +0000 |
| commit | c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039 (patch) | |
| tree | da78de49cb18d372d5a3dfd336235b4e70ba6cee /phpBB/includes/ucp | |
| parent | ef0c0d4c82dadfb856357f6ae906263420d84791 (diff) | |
| download | forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar.gz forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar.bz2 forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.tar.xz forums-c8e3035a4b5dfa6ad5535da4a2a51eea1aafa039.zip | |
Merge R 9067
git-svn-id: file:///svn/phpbb/trunk@9068 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/ucp')
| -rw-r--r-- | phpBB/includes/ucp/ucp_activate.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/ucp/ucp_groups.php | 6 |
2 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/includes/ucp/ucp_activate.php b/phpBB/includes/ucp/ucp_activate.php index 5db9fd5bd1..594e346310 100644 --- a/phpBB/includes/ucp/ucp_activate.php +++ b/phpBB/includes/ucp/ucp_activate.php @@ -50,7 +50,7 @@ class ucp_activate trigger_error('ALREADY_ACTIVATED'); } - if ($user_row['user_actkey'] != $key) + if (($user_row['user_inactive_reason'] == INACTIVE_MANUAL) || $user_row['user_actkey'] != $key) { trigger_error('WRONG_ACTIVATION'); } diff --git a/phpBB/includes/ucp/ucp_groups.php b/phpBB/includes/ucp/ucp_groups.php index 212348f0fd..2d38ea9a43 100644 --- a/phpBB/includes/ucp/ucp_groups.php +++ b/phpBB/includes/ucp/ucp_groups.php @@ -413,6 +413,9 @@ class ucp_groups $this->page_title = 'UCP_USERGROUPS_MANAGE'; $action = (isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''); $group_id = request_var('g', 0); + + include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT); + add_form_key('ucp_groups'); if ($group_id) @@ -437,6 +440,7 @@ class ucp_groups $group_name = $group_row['group_name']; $group_type = $group_row['group_type']; + $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_ROOT_PATH . PHPBB_ADMIN_PATH . 'images/no_avatar.gif" alt="" />'; $template->assign_vars(array( @@ -457,8 +461,6 @@ class ucp_groups { case 'edit': - include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT); - if (!$group_id) { trigger_error($user->lang['NO_GROUP'] . $return_page); |