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

Merge pull request #5853 from mrgoldy/ticket/16060

Browse Source 
[ticket/16060] Correct auto prune column for cron job
This commit is contained in:
Marc Alexander
2020-02-14 07:31:19 +01:00
parent d75952394f 2d2c0ab6cd
commit 7735f22562
3 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
phpBB/includes/functions_admin.php
View File

@@ -2415,7 +2415,7 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync
/**
* Function auto_prune(), this function now relies on passed vars
*/
function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_freq)
function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_freq, $log_prune = true)
{
global $db, $user, $phpbb_log;
@@ -2435,13 +2435,18 @@ function auto_prune($forum_id, $prune_mode, $prune_flags, $prune_days, $prune_fr
if ($result['topics'] == 0 && $result['posts'] == 0)
{
$column = $prune_mode === 'shadow' ? 'prune_shadow_next' : 'prune_next';
$sql = 'UPDATE ' . FORUMS_TABLE . "
SET prune_next = $next_prune
SET $column = $next_prune
WHERE forum_id = $forum_id";
$db->sql_query($sql);
}
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_AUTO_PRUNE', false, array($row['forum_name']));
if ($log_prune)
{
$phpbb_log->add('admin', $user->data['user_id'], $user->ip, 'LOG_AUTO_PRUNE', false, [$row['forum_name']]);
}
}
return;