diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:05:12 +0100 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2015-01-06 11:05:12 +0100 |
| commit | ba11a915245ed08a178e13addbcf3bfe11616205 (patch) | |
| tree | 5f53d9c61db787ff1562e2b5e701607c2d6009e5 /phpBB | |
| parent | 2edf94741562c7a5e0befe91173f6ccfdbaab1fc (diff) | |
| parent | d36b0452bd49b5f44ab18174a9dabfd45424e519 (diff) | |
| download | forums-ba11a915245ed08a178e13addbcf3bfe11616205.tar forums-ba11a915245ed08a178e13addbcf3bfe11616205.tar.gz forums-ba11a915245ed08a178e13addbcf3bfe11616205.tar.bz2 forums-ba11a915245ed08a178e13addbcf3bfe11616205.tar.xz forums-ba11a915245ed08a178e13addbcf3bfe11616205.zip | |
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 0b9ea23fe7..b016659541 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2311,7 +2311,7 @@ function sync($mode, $where_type = '', $where_ids = '', $resync_parents = false, */ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync = true) { - global $db; + global $db, $phpbb_dispatcher; if (!is_array($forum_id)) { @@ -2351,6 +2351,21 @@ function prune($forum_id, $prune_mode, $prune_date, $prune_flags = 0, $auto_sync $sql_and .= ' AND topic_status = ' . ITEM_MOVED . " AND topic_last_post_time < $prune_date"; } + /** + * Use this event to modify the SQL that selects topics to be pruned + * + * @event core.prune_sql + * @var string forum_id The forum id + * @var string prune_mode The prune mode + * @var string prune_date The prune date + * @var int prune_flags The prune flags + * @var bool auto_sync Whether or not to perform auto sync + * @var string sql_and SQL text appended to where clause + * @since 3.1.3-RC1 + */ + $vars = array('forum_id', 'prune_mode', 'prune_date', 'prune_flags', 'auto_sync', 'sql_and'); + extract($phpbb_dispatcher->trigger_event('core.prune_sql', compact($vars))); + $sql = 'SELECT topic_id FROM ' . TOPICS_TABLE . ' WHERE ' . $db->sql_in_set('forum_id', $forum_id) . " |