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

fix r9758

Browse Source 
Authorised by: AcydBurn

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9828 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Joas Schilling
2009-07-22 11:47:37 +00:00
parent 2dfd327828
commit 818b252f20
4 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
phpBB/includes/acp/acp_users.php
View File

@@ -1160,11 +1160,13 @@ class acp_users
if ($deleteall)
{
$deleted_warnings = '0';
$log_warnings = $deleted_warnings = 0;
}
else
{
$deleted_warnings = ' user_warnings - ' . $db->sql_affectedrows();
$num_warnings = (int) $db->sql_affectedrows();
$deleted_warnings = ' user_warnings - ' . $num_warnings;
$log_warnings = ($num_warnings > 2) ? 2 : $num_warnings;
}
$sql = 'UPDATE ' . USERS_TABLE . "
@@ -1172,7 +1174,18 @@ class acp_users
WHERE user_id = $user_id";
$db->sql_query($sql);
add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']);
switch ($log_warnings)
{
case 2:
add_log('admin', 'LOG_WARNINGS_DELETED', $user_row['username'], $num_warnings);
break;
case 1:
add_log('admin', 'LOG_WARNING_DELETED', $user_row['username']);
break;
default:
add_log('admin', 'LOG_WARNINGS_DELETED_ALL', $user_row['username']);
break;
}
}
}
else

2
phpBB/includes/functions.php
View File

@@ -4035,7 +4035,7 @@ function page_footer($run_cron = true)
// Tidy the cache
$cron_type = 'tidy_cache';
}
else if ($config['warnings_last_gc'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
else if ($config['warnings_expire_days'] && (time() - $config['warnings_gc'] > $config['warnings_last_gc']))
{
$cron_type = 'tidy_warnings';
}