aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_board.php5
-rw-r--r--phpBB/language/en/acp/board.php3
2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php
index ace7dd4990..55e4ceb9e8 100644
--- a/phpBB/includes/acp/acp_board.php
+++ b/phpBB/includes/acp/acp_board.php
@@ -101,7 +101,10 @@ class acp_board
'max_post_font_size' => array('lang' => 'MAX_POST_FONT_SIZE', 'type' => 'text:5:4', 'explain' => true),
'max_quote_depth' => array('lang' => 'QUOTE_DEPTH_LIMIT', 'type' => 'text:4:4', 'explain' => true),
'max_post_img_width' => array('lang' => 'MAX_POST_IMG_WIDTH', 'type' => 'text:5:4', 'explain' => true),
- 'max_post_img_height' => array('lang' => 'MAX_POST_IMG_HEIGHT', 'type' => 'text:5:4', 'explain' => true)
+ 'max_post_img_height' => array('lang' => 'MAX_POST_IMG_HEIGHT', 'type' => 'text:5:4', 'explain' => true),
+
+ 'legend5' => 'MODERATION',
+ 'warnings_expire_days' => array('lang' => 'WARNINGS_EXPIRE', 'type' => 'text:3:4', 'explain' => true)
)
);
break;
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index ab1a6a9e98..2f16caa30d 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -313,6 +313,9 @@ $lang = array_merge($lang, array(
'COPPA' => 'Coppa',
'REGISTRATION' => 'User Registration',
'POSTING' => 'Posting',
+ 'MODERATION' => 'Moderation',
+ 'WARNINGS_EXPIRE' => 'Warning duration',
+ 'WARNINGS_EXPIRE_EXPLAIN' => 'Number of days after it is issued before a warning will expire from a user\'s record',
));
// Auth settings