mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

- remove description from profile fields

Browse Source 
- added disclaimer about DEBUG_EXTRA to the ACP (i think this is needed - some idiots might think it is wise to have this enabled on a production board. :) We *may* let it there for the Betas though, but it will be removed during the RC's)
- some bugfixes


git-svn-id: file:///svn/phpbb/trunk@5973 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Meik Sievertsen
2006-05-27 16:24:21 +00:00
parent b51b978854
commit ce4445f74a
22 changed files with 240 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,12 +26,13 @@ class ucp_activate
FROM ' . USERS_TABLE . "
WHERE user_id = $user_id";
$result = $db->sql_query($sql);
$row = $db->sql_fetchrow($result);
$db->sql_freeresult($result);
if (!($row = $db->sql_fetchrow($result)))
if (!$row)
{
trigger_error($user->lang['NO_USER']);
}
$db->sql_freeresult($result);
if ($row['user_type'] <> USER_INACTIVE && !$row['user_newpasswd'])
{
@@ -66,7 +67,7 @@ class ucp_activate
// Now we need to demote the user from the inactive group and add him to the registered group
include_once($phpbb_root_path . 'includes/functions_user.' . $phpEx);
user_active_flip($row['user_id'], $row['user_type'], '', $row['username']);
user_active_flip($row['user_id'], $row['user_type'], '', $row['username'], true);
}
if ($config['require_activation'] == USER_ACTIVATION_ADMIN && !$update_password)

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

@@ -434,7 +434,7 @@ function get_user_informations($user_id, $user_row)
if (!empty($user_row['user_rank']))
{
$user_row['rank_title'] = $ranks['special'][$user_row['user_rank']]['rank_title'];
$user_row['rank_title'] = (isset($ranks['special'][$user_row['user_rank']])) ? $ranks['special'][$user_row['user_rank']]['rank_title'] : '';
$user_row['rank_image'] = (!empty($ranks['special'][$user_row['user_rank']]['rank_image'])) ? '<img src="' . $config['ranks_path'] . '/' . $ranks['special'][$user_row['user_rank']]['rank_image'] . '" border="0" alt="' . $ranks['special'][$user_row['user_rank']]['rank_title'] . '" title="' . $ranks['special'][$user_row['user_rank']]['rank_title'] . '" /><br />' : '';
}
else