mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-02 14:57:37 +02:00
Code Issues Releases Wiki Activity

Merge R 9067

Browse Source 
git-svn-id: file:///svn/phpbb/trunk@9068 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Henry Sudhof
2008-11-21 13:46:39 +00:00
parent ef0c0d4c82
commit c8e3035a4b
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
phpBB/includes/ucp/ucp_activate.php
View File

@@ -50,7 +50,7 @@ class ucp_activate
trigger_error('ALREADY_ACTIVATED'); 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'); trigger_error('WRONG_ACTIVATION');
} }

6
phpBB/includes/ucp/ucp_groups.php
View File

@@ -413,6 +413,9 @@ class ucp_groups
$this->page_title = 'UCP_USERGROUPS_MANAGE'; $this->page_title = 'UCP_USERGROUPS_MANAGE';
$action = (isset($_POST['addusers'])) ? 'addusers' : request_var('action', ''); $action = (isset($_POST['addusers'])) ? 'addusers' : request_var('action', '');
$group_id = request_var('g', 0); $group_id = request_var('g', 0);
include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
add_form_key('ucp_groups'); add_form_key('ucp_groups');
if ($group_id) if ($group_id)
@@ -437,6 +440,7 @@ class ucp_groups
$group_name = $group_row['group_name']; $group_name = $group_row['group_name'];
$group_type = $group_row['group_type']; $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="" />'; $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( $template->assign_vars(array(
@@ -457,8 +461,6 @@ class ucp_groups
{ {
case 'edit': case 'edit':
include(PHPBB_ROOT_PATH . 'includes/functions_display.' . PHP_EXT);
if (!$group_id) if (!$group_id)
{ {
trigger_error($user->lang['NO_GROUP'] . $return_page); trigger_error($user->lang['NO_GROUP'] . $return_page);