diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-04-06 22:26:27 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-04-06 22:26:27 +0200 |
| commit | f0176b53934e78b830b890ef46c1e8e7c233bee4 (patch) | |
| tree | 9fc72119ba4003f15b06cd6cfd15d66790f6828f /phpBB/includes/functions_admin.php | |
| parent | 6f122d688660adbdb6284625c499216da3bf5ebf (diff) | |
| parent | e83c6cb61dcac9c8460e0e8fd22cb2f3324fb248 (diff) | |
| download | forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.gz forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.bz2 forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.tar.xz forums-f0176b53934e78b830b890ef46c1e8e7c233bee4.zip | |
Merge remote-tracking branch 'Marc/ticket/12150' into develop-ascraeus
* Marc/ticket/12150:
[ticket/12150] Use correct license URL in prune shadow migrations file
[ticket/12150] Remove 'after' for columns from migrations file
[ticket/12150] Update schema files for prune shadow topics
[ticket/12150] Use log service instead of add_log() function
[ticket/12150] Use shorter column names for prune settings
[ticket/12150] Add functional tests for pruning shadow topics
[ticket/12150] Add missing space to query for shadow topics
[ticket/12150] Add missing prune settings variables in acp_forums
[ticket/12150] Add file and caller for pruning shadow topics
[ticket/12150] Add prune columns to schema files and migration file
[ticket/12150] Add options to acp
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 81a381b326..2bf8e6dcf0 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2326,6 +2326,11 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync $sql_and .= " AND topic_last_view_time < $prune_date"; } + if ($prune_mode == 'shadow') + { + $sql_and .= ' AND topic_status = ' . ITEM_MOVED . " AND topic_last_post_time < $prune_date"; + } + $sql = 'SELECT topic_id FROM ' . TOPICS_TABLE . ' WHERE ' . $db->sql_in_set('forum_id', $forum_id) . " |