Conflicts:
	inc/config.php
	inc/display.php
	inc/mod/pages.php
	js/catalog-link.js
	post.php
	templates/banned.html
This commit is contained in:
czaks 2013-08-11 09:50:33 -04:00
commit fa9bf536c3
7 changed files with 29 additions and 30 deletions

View file

@ -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