Merge branch 'master' of https://github.com/savetheinternet/Tinyboard

Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html

1 files changed, 3 insertions, 0 deletions

diff --git a/inc/display.php b/inc/display.php
index 241f81e3..0fdf1fff 100644
--- a/inc/display.php
+++ b/inc/display.php
@@ -46,6 +46,9 @@ function createBoardlist($mod=false) {
 	if (!isset($config['boards'])) return array('top'=>'','bottom'=>'');
 	
 	$body = doBoardListPart($config['boards'], $mod?'?/':$config['root']);
+
+	if ($config['boardlist_wrap_bracket'] && !preg_match('/\] $/', $body))
+		$body = '[' . $body . ']';
 	
 	$body = trim($body);