diff options
| author | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 12:36:26 +0100 |
|---|---|---|
| committer | Tristan Darricau <github@nicofuma.fr> | 2017-01-15 12:36:26 +0100 |
| commit | 4fd6b0fd88a0ea616a64ce746d3be260cc837138 (patch) | |
| tree | b3fa4c9ebfe3a261e2a2aeea815123fe2fc316d8 /phpBB | |
| parent | 2637606ae1b033c12a34efd946dac145a679945f (diff) | |
| parent | a3accfaf461bc963f0661bdab1befbc9ef50a514 (diff) | |
| download | forums-4fd6b0fd88a0ea616a64ce746d3be260cc837138.tar forums-4fd6b0fd88a0ea616a64ce746d3be260cc837138.tar.gz forums-4fd6b0fd88a0ea616a64ce746d3be260cc837138.tar.bz2 forums-4fd6b0fd88a0ea616a64ce746d3be260cc837138.tar.xz forums-4fd6b0fd88a0ea616a64ce746d3be260cc837138.zip | |
Merge pull request #4632 from VSEphpbb/ticket/14989
[ticket/14989] Allow more admin-configurable schemes in post links
* VSEphpbb/ticket/14989:
[ticket/14989] Allow more admin-configurable schemes in post links
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_board.php | 7 | ||||
| -rw-r--r-- | phpBB/language/en/acp/board.php | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_board.php b/phpBB/includes/acp/acp_board.php index 826d0007b7..1f9c15dbd0 100644 --- a/phpBB/includes/acp/acp_board.php +++ b/phpBB/includes/acp/acp_board.php @@ -196,6 +196,7 @@ class acp_board 'allow_post_flash' => array('lang' => 'ALLOW_POST_FLASH', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_smilies' => array('lang' => 'ALLOW_SMILIES', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => false), 'allow_post_links' => array('lang' => 'ALLOW_POST_LINKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), + 'allowed_schemes_links' => array('lang' => 'ALLOWED_SCHEMES_LINKS', 'validate' => 'string', 'type' => 'text:0:255', 'explain' => true), 'allow_nocensors' => array('lang' => 'ALLOW_NO_CENSORS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'allow_bookmarks' => array('lang' => 'ALLOW_BOOKMARKS', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), 'enable_post_confirm' => array('lang' => 'VISUAL_CONFIRM_POST', 'validate' => 'bool', 'type' => 'radio:yes_no', 'explain' => true), @@ -552,6 +553,12 @@ class acp_board } } + // Invalidate the text_formatter cache when posting options are changed + if ($mode == 'post' && $submit) + { + $phpbb_container->get('text_formatter.cache')->invalidate(); + } + // Store news and exclude ids if ($mode == 'feed' && $submit) { diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php index 08290c9617..6a5a4158e3 100644 --- a/phpBB/language/en/acp/board.php +++ b/phpBB/language/en/acp/board.php @@ -161,6 +161,8 @@ $lang = array_merge($lang, array( 'ACP_POST_SETTINGS_EXPLAIN' => 'Here you can set all default settings for posting.', 'ALLOW_POST_LINKS' => 'Allow links in posts/private messages', 'ALLOW_POST_LINKS_EXPLAIN' => 'If disallowed the <code>[URL]</code> BBCode tag and automatic/magic URLs are disabled.', + 'ALLOWED_SCHEMES_LINKS' => 'Allowed schemes in links', + 'ALLOWED_SCHEMES_LINKS_EXPLAIN' => 'Users can only post schemeless URLs or one of the comma-separated list of allowed schemes.', 'ALLOW_POST_FLASH' => 'Allow use of <code>[FLASH]</code> BBCode tag in posts', 'ALLOW_POST_FLASH_EXPLAIN' => 'If disallowed the <code>[FLASH]</code> BBCode tag is disabled in posts. Otherwise the permission system controls which users can use the <code>[FLASH]</code> BBCode tag.', |