Merge conflict

This commit is contained in:
ctrlcctrlv 2013-08-11 15:36:17 +00:00
commit b9ec342750
6 changed files with 28 additions and 29 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