summaryrefslogtreecommitdiff
path: root/post.php
diff options
context:
space:
mode:
authorczaks <marcin@6irc.net>2013-07-31 17:02:30 -0400
committerczaks <marcin@6irc.net>2013-07-31 17:02:30 -0400
commitc0abd1d851b1866e8a9709a0c75797025b77aa40 (patch)
treeb9622c692a68036de2018ffd68880e0dc773ad9e /post.php
parent3d979750b1be802549e4e18662c7e642f466daaa (diff)
parent6cdf6038754f18af4509ecf078f51894f63c5853 (diff)
Merge branch 'master' of https://github.com/savetheinternet/Tinyboard
Diffstat (limited to 'post.php')
-rw-r--r--post.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/post.php b/post.php
index 45bca539..f6cdcb00 100644
--- a/post.php
+++ b/post.php
@@ -286,7 +286,7 @@ if (isset($_POST['delete'])) {
$post['has_file'] = !isset($post['embed']) && (($post['op'] && !isset($post['no_longer_require_an_image_for_op']) && $config['force_image_op']) || (isset($_FILES['file']) && $_FILES['file']['tmp_name'] != ''));
if ($post['has_file'])
- $post['filename'] = utf8tohtml(get_magic_quotes_gpc() ? stripslashes($_FILES['file']['name']) : $_FILES['file']['name']);
+ $post['filename'] = urldecode(get_magic_quotes_gpc() ? stripslashes($_FILES['file']['name']) : $_FILES['file']['name']);
if (!($post['has_file'] || isset($post['embed'])) || (($post['op'] && $config['force_body_op']) || (!$post['op'] && $config['force_body']))) {
$stripped_whitespace = preg_replace('/[\s]/u', '', $post['body']);
@@ -349,7 +349,7 @@ if (isset($_POST['delete'])) {
} else $noko = false;
if ($post['has_file']) {
- $post['extension'] = strtolower(substr($post['filename'], strrpos($post['filename'], '.') + 1));
+ $post['extension'] = strtolower(mb_substr($post['filename'], mb_strrpos($post['filename'], '.') + 1));
if (isset($config['filename_func']))
$post['file_id'] = $config['filename_func']($post);
else
@@ -416,7 +416,7 @@ if (isset($_POST['delete'])) {
$is_an_image = !in_array($post['extension'], $config['allowed_ext_files']);
// Truncate filename if it is too long
- $post['filename'] = substr($post['filename'], 0, $config['max_filename_len']);
+ $post['filename'] = mb_substr($post['filename'], 0, $config['max_filename_len']);
$upload = $_FILES['file']['tmp_name'];