github/torrentpier
1
0
Fork 0
mirror of https://github.com/torrentpier/torrentpier synced 2025-08-22 14:23:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

r498

Browse source 
правка багов git-svn-id: https://torrentpier2.googlecode.com/svn/trunk@498 a8ac35ab-4ca4-ca47-4c2d-a49a94f06293
This commit is contained in:
nanosimbiot 2013-04-10 18:12:05 +00:00
commit c2c05916cd
2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

16
upload/admin/admin_attach_cp.php
View file

@ -440,16 +440,7 @@ if ($view == 'attachments')
WHERE a.attach_id IN (" . implode(', ', $attach_id) . ") " . WHERE a.attach_id IN (" . implode(', ', $attach_id) . ") " .
$order_by; $order_by;
} if ( !($result = DB()->sql_query($sql)) )
else if ($search_based)
{
// we are called from search
$attachments = search_attachments($order_by, $total_rows);
}
if (!$search_based)
{
if ( !($result = DB()->sql_query($sql)) )
{ {
message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql); message_die(GENERAL_ERROR, 'Couldn\'t query attachments', '', __LINE__, __FILE__, $sql);
} }
@ -458,6 +449,11 @@ if ($view == 'attachments')
$num_attach = DB()->num_rows($result); $num_attach = DB()->num_rows($result);
DB()->sql_freeresult($result); DB()->sql_freeresult($result);
} }
else
{
// we are called from search
$attachments = search_attachments($order_by, $total_rows);
}
if (sizeof($attachments) > 0) if (sizeof($attachments) > 0)
{ {

7
upload/includes/ucp/usercp_register.php
View file

@ -311,8 +311,11 @@ foreach ($profile_fields as $field => $can_edit)
{ {
$errors[] = $err; $errors[] = $err;
} }
$pr_data['user_active'] = 0; if ($bb_cfg['require_activation'] == USER_ACTIVATION_SELF || $bb_cfg['require_activation'] == USER_ACTIVATION_ADMIN)
$db_data['user_active'] = 0; {
$pr_data['user_active'] = 0;
$db_data['user_active'] = 0;
}
$db_data['user_email'] = $email; $db_data['user_email'] = $email;
} }
} }