diff options
| author | Marc Alexander <admin@m-a-styles.de> | 2018-10-20 12:27:13 -0400 |
|---|---|---|
| committer | Marc Alexander <admin@m-a-styles.de> | 2018-10-20 12:27:13 -0400 |
| commit | fba55791c112d4e556f63063a1c276473671eb8a (patch) | |
| tree | f0ee2519f2c92bb88e6937e05e117f2bbfb16eb6 /phpBB/phpbb | |
| parent | e2a6a7e83a0e98c1e2d1fdced270d760b928bc20 (diff) | |
| parent | 842e40dab91302772e0e2916043429de884bc226 (diff) | |
| download | forums-fba55791c112d4e556f63063a1c276473671eb8a.tar forums-fba55791c112d4e556f63063a1c276473671eb8a.tar.gz forums-fba55791c112d4e556f63063a1c276473671eb8a.tar.bz2 forums-fba55791c112d4e556f63063a1c276473671eb8a.tar.xz forums-fba55791c112d4e556f63063a1c276473671eb8a.zip | |
Merge pull request #5403 from Elsensee/ticket/14812
[ticket/14812] Prune shadow topics during system cron too
Diffstat (limited to 'phpBB/phpbb')
| -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); |