diff options
| author | czaks <marcin@6irc.net> | 2013-08-11 09:50:33 -0400 |
|---|---|---|
| committer | czaks <marcin@6irc.net> | 2013-08-11 09:50:33 -0400 |
| commit | fa9bf536c356a49bf5d182a52f3ab47ea0c1b227 (patch) | |
| tree | 12b45d039c0688d03f1066a32c38f594385ed47f /inc/mod/pages.php | |
| parent | ebac98e207290d5beddb0af6c8b259e15e9da361 (diff) | |
| parent | 0de3ead32a42c5d5c1640765beb7147ea991ae1d (diff) | |
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
Diffstat (limited to 'inc/mod/pages.php')
| -rw-r--r-- | inc/mod/pages.php | 3 |
1 files changed, 1 insertions, 2 deletions
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 |