diff options
| author | Oliver Schramm <oliver.schramm97@gmail.com> | 2018-10-04 01:56:52 +0200 |
|---|---|---|
| committer | Oliver Schramm <oliver.schramm97@gmail.com> | 2018-10-04 01:56:52 +0200 |
| commit | 842e40dab91302772e0e2916043429de884bc226 (patch) | |
| tree | 4d958ece20a769e00f35e75cca3be737b6a93e8b /phpBB/phpbb/cron/task | |
| parent | 001f32da95d4f8697ccc9a6107afc8dc68cbe48e (diff) | |
| download | forums-842e40dab91302772e0e2916043429de884bc226.tar forums-842e40dab91302772e0e2916043429de884bc226.tar.gz forums-842e40dab91302772e0e2916043429de884bc226.tar.bz2 forums-842e40dab91302772e0e2916043429de884bc226.tar.xz forums-842e40dab91302772e0e2916043429de884bc226.zip | |
[ticket/14812] Prune shadow topics during system cron too
PHPBB3-14812
Diffstat (limited to 'phpBB/phpbb/cron/task')
| -rw-r--r-- | phpBB/phpbb/cron/task/core/prune_all_forums.php | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/phpBB/phpbb/cron/task/core/prune_all_forums.php b/phpBB/phpbb/cron/task/core/prune_all_forums.php index b47939ccbe..5005f5b894 100644 --- a/phpBB/phpbb/cron/task/core/prune_all_forums.php +++ b/phpBB/phpbb/cron/task/core/prune_all_forums.php @@ -55,21 +55,26 @@ class prune_all_forums extends \phpbb\cron\task\base 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 - FROM ' . FORUMS_TABLE . " - WHERE enable_prune = 1 - AND prune_next < " . time(); + $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; $result = $this->db->sql_query($sql); 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); |