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

3 files changed, 11 insertions, 5 deletions

diff --git a/inc/config.php b/inc/config.php
index 440ce9aa..a46b953a 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'] = '';
 
 /*
  * ====================
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);
 	
diff --git a/inc/mod/pages.php b/inc/mod/pages.php
index 9c26e0c4..b087f6db 100644
--- a/inc/mod/pages.php
+++ b/inc/mod/pages.php
@@ -1148,9 +1148,8 @@ function mod_move($originBoard, $postID) {
 		if ($post['has_file']) {
 			// copy image
 			$clone($file_src, sprintf($config['board_path'], $board['uri']) . $config['dir']['img'] . $post['file']);
-			if ($post['thumb'] != 'spoiler') { //trying to move/copy the spoiler thumb raises an error
+			if (!in_array($post['thumb'], array('spoiler', 'deleted')))
 				$clone($file_thumb, sprintf($config['board_path'], $board['uri']) . $config['dir']['thumb'] . $post['thumb']);
-			}
 		}
 		
 		// go back to the original board to fetch replies