diff options
| -rw-r--r-- | phpBB/admin/admin_board.php | 4 | ||||
| -rw-r--r-- | phpBB/templates/subSilver/admin/admin_config_body.tpl | 4 |
2 files changed, 7 insertions, 1 deletions
diff --git a/phpBB/admin/admin_board.php b/phpBB/admin/admin_board.php index 89c4476c5a..5c70130d0e 100644 --- a/phpBB/admin/admin_board.php +++ b/phpBB/admin/admin_board.php @@ -66,6 +66,7 @@ $style_select = style_select($new['default_style'], 'default_style', "../templat $admin_style_select = style_select($new['default_admin_style'], 'default_admin_style', "../templates"); $lang_select = language_select($new['default_lang'], 'default_lang', "../language"); $timezone_select = tz_select($new['board_timezone'], 'board_timezone'); +$html_tags = $new['allow_html_tags']; $override_user_style_yes = ($new['override_user_style']) ? "checked=\"checked\"" : ""; $override_user_style_no = (!$new['override_user_style']) ? "checked=\"checked\"" : ""; @@ -129,7 +130,8 @@ $template->assign_vars(array( "GZIP_YES" => $gzip_yes, "GZIP_NO" => $gzip_no, "PRUNE_YES" => $prune_yes, - "PRUNE_NO" => $prune_no, + "PRUNE_NO" => $prune_no, + "HTML_TAGS" => $html_tags, "HTML_YES" => $html_yes, "HTML_NO" => $html_no, "BBCODE_YES" => $bbcode_yes, diff --git a/phpBB/templates/subSilver/admin/admin_config_body.tpl b/phpBB/templates/subSilver/admin/admin_config_body.tpl index c2dbaf44c6..bb7ecb2c33 100644 --- a/phpBB/templates/subSilver/admin/admin_config_body.tpl +++ b/phpBB/templates/subSilver/admin/admin_config_body.tpl @@ -67,6 +67,10 @@ <td class="row2"><input type="radio" name="allow_html" value="1" {HTML_YES}> {L_YES} <input type="radio" name="allow_html" value="0" {HTML_NO}> {L_NO}</td> </tr> <tr> + <td class="row1">Allowed HTML tags<br /><span class="gensmall">Seperate tags with commas</span></td> + <td class="row2"><input type="text" size="30" maxlength="255" name="allow_html_tags" value="{HTML_TAGS}"></td> + </tr> + <tr> <td class="row1">Allow BBCode</td> <td class="row2"><input type="radio" name="allow_bbcode" value="1" {BBCODE_YES}> {L_YES} <input type="radio" name="allow_bbcode" value="0" {BBCODE_NO}> {L_NO}</td> </tr> |