diff options
| author | ctrlcctrlv <wizardchan@hush.com> | 2013-08-11 15:36:17 +0000 |
|---|---|---|
| committer | ctrlcctrlv <wizardchan@hush.com> | 2013-08-11 15:36:17 +0000 |
| commit | b9ec342750009037893e1bb06640905c6d88b5dd (patch) | |
| tree | 18d253df2e6acaf9d156c1742c233d51357af478 /inc/config.php | |
| parent | efebd3022198995395859ddc07b1a48828ef1f89 (diff) | |
| parent | aeb33169eaa2c18cbf6d6791dc35e911136f983a (diff) | |
Merge conflict
Diffstat (limited to 'inc/config.php')
| -rw-r--r-- | inc/config.php | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/inc/config.php b/inc/config.php index bf966235..fd16b94c 100644 --- a/inc/config.php +++ b/inc/config.php @@ -624,7 +624,7 @@ // Oh, and add jQuery in additional_javascript. $config['attention_bar'] = false; - // Allow html in board subtitle. This is useful for placing icons and links. + // Allow unfiltered HTML in board subtitle. This is useful for placing icons and links. $config['allow_subtitle_html'] = false; /* @@ -718,6 +718,9 @@ // array('status' => 'http://status.example.org/') // ); + // Whether or not to put brackets around the whole board list + $config['boardlist_wrap_bracket'] = false; + // Board categories. Only used in the "Categories" theme. // $config['categories'] = array( // 'Group Name' => array('a', 'b', 'c'), @@ -744,8 +747,9 @@ // 'bottom' => '', // ); - // Optional message to display on ban pages. For example, you could include a link to email an admin or join an IRC channel to be unbanned. - $config['ban_page_message'] = ''; + // Optional HTML to append to "You are banned" pages. For example, you could include instructions and/or + // a link to an email address or IRC chat room to appeal the ban. + $config['ban_page_extra'] = ''; /* * ==================== |