aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/install
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-04-06 22:26:27 +0200
committerJoas Schilling <nickvergessen@gmx.de>2014-04-06 22:26:27 +0200
commitf0176b53934e78b830b890ef46c1e8e7c233bee4 (patch)
tree9fc72119ba4003f15b06cd6cfd15d66790f6828f /phpBB/install
parent6f122d688660adbdb6284625c499216da3bf5ebf (diff)
parente83c6cb61dcac9c8460e0e8fd22cb2f3324fb248 (diff)
downloadforums-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/install')
-rw-r--r--phpBB/install/schemas/schema.json16
1 files changed, 16 insertions, 0 deletions
diff --git a/phpBB/install/schemas/schema.json b/phpBB/install/schemas/schema.json
index 15d2fd6e84..176691f1a6 100644
--- a/phpBB/install/schemas/schema.json
+++ b/phpBB/install/schemas/schema.json
@@ -800,6 +800,22 @@
"UINT:20",
0
],
+ "enable_shadow_prune": [
+ "BOOL",
+ 0
+ ],
+ "prune_shadow_days": [
+ "UINT",
+ 7
+ ],
+ "prune_shadow_freq": [
+ "UINT",
+ 1
+ ],
+ "prune_shadow_next": [
+ "INT:11",
+ 0
+ ],
"forum_posts_approved": [
"UINT",
0