mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-07 06:55:25 +02:00
Code Issues Releases Wiki Activity

Merge pull request #5403 from Elsensee/ticket/14812

Browse Source 
[ticket/14812] Prune shadow topics during system cron too
This commit is contained in:
Marc Alexander 2018-10-20 12:27:13 -04:00
commit fba55791c1
No known key found for this signature in database
GPG Key ID: 50E0D2423696F995
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
phpBB/phpbb/cron/task/core/prune_all_forums.php
View File

@ -55,21 +55,26 @@ class prune_all_forums extends \phpbb\cron\task\base
include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext); include($this->phpbb_root_path . 'includes/functions_admin.' . $this->php_ext);
} }
$sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, forum_flags, prune_freq $sql = 'SELECT forum_id, prune_next, enable_prune, prune_days, prune_viewed, enable_shadow_prune, prune_shadow_days, prune_shadow_freq, prune_shadow_next, forum_flags, prune_freq
FROM ' . FORUMS_TABLE . " FROM ' . FORUMS_TABLE;
WHERE enable_prune = 1
AND prune_next < " . time();
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
while ($row = $this->db->sql_fetchrow($result)) while ($row = $this->db->sql_fetchrow($result))
{ {
if ($row['prune_days']) if ($row['enable_prune'] && $row['prune_next'] < time())
{ {
auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']); if ($row['prune_days'])
} {
auto_prune($row['forum_id'], 'posted', $row['forum_flags'], $row['prune_days'], $row['prune_freq']);
}
if ($row['prune_viewed']) if ($row['prune_viewed'])
{
auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']);
}
}
if ($row['enable_shadow_prune'] && $row['prune_shadow_next'] < time() && $row['prune_shadow_days'])
{ {
auto_prune($row['forum_id'], 'viewed', $row['forum_flags'], $row['prune_viewed'], $row['prune_freq']); auto_prune($row['forum_id'], 'shadow', $row['forum_flags'], $row['prune_shadow_days'], $row['prune_shadow_freq']);
} }
} }
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);