diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-01 12:28:50 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-01 12:28:50 +0000 |
| commit | 2958890439f29b9cf45997c52c8cfa57e0f16bc8 (patch) | |
| tree | 8a2703312cd3bc4b81f60e339351f72b1482a889 /phpBB/includes/functions_admin.php | |
| parent | 6bc7e1516206862472091e53d8f3f357a755eac8 (diff) | |
| download | forums-2958890439f29b9cf45997c52c8cfa57e0f16bc8.tar forums-2958890439f29b9cf45997c52c8cfa57e0f16bc8.tar.gz forums-2958890439f29b9cf45997c52c8cfa57e0f16bc8.tar.bz2 forums-2958890439f29b9cf45997c52c8cfa57e0f16bc8.tar.xz forums-2958890439f29b9cf45997c52c8cfa57e0f16bc8.zip | |
Apply locale-independent basename() to attachment filenames. New function added: utf8_basename(). (Bug #43335 - Patch by ocean=Yohsuke)
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9905 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index e9a95f1ec6..38388236eb 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -1235,7 +1235,7 @@ function phpbb_unlink($filename, $mode = 'file', $entry_removed = false) // Because of copying topics or modifications a physical filename could be assigned more than once. If so, do not remove the file itself. $sql = 'SELECT COUNT(attach_id) AS num_entries FROM ' . ATTACHMENTS_TABLE . " - WHERE physical_filename = '" . $db->sql_escape(basename($filename)) . "'"; + WHERE physical_filename = '" . $db->sql_escape(utf8_basename($filename)) . "'"; $result = $db->sql_query($sql); $num_entries = (int) $db->sql_fetchfield('num_entries'); $db->sql_freeresult($result); @@ -1246,7 +1246,7 @@ function phpbb_unlink($filename, $mode = 'file', $entry_removed = false) return false; } - $filename = ($mode == 'thumbnail') ? 'thumb_' . basename($filename) : basename($filename); + $filename = ($mode == 'thumbnail') ? 'thumb_' . utf8_basename($filename) : utf8_basename($filename); return @unlink($phpbb_root_path . $config['upload_path'] . '/' . $filename); } |