aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2015-04-26 09:24:09 +0200
committerMarc Alexander <admin@m-a-styles.de>2015-04-26 09:24:09 +0200
commit03eae6fddd5bb96dd140e00ad8aaef4a8f562c08 (patch)
tree3ba807e1498a38704e92f945b9e78d2b72c25106 /phpBB/includes
parent3305885fc80c24be7316bebcaed07307397e5c7d (diff)
parent59a178f3cba87f536826df251120f03980a556c6 (diff)
downloadforums-03eae6fddd5bb96dd140e00ad8aaef4a8f562c08.tar
forums-03eae6fddd5bb96dd140e00ad8aaef4a8f562c08.tar.gz
forums-03eae6fddd5bb96dd140e00ad8aaef4a8f562c08.tar.bz2
forums-03eae6fddd5bb96dd140e00ad8aaef4a8f562c08.tar.xz
forums-03eae6fddd5bb96dd140e00ad8aaef4a8f562c08.zip
Merge branch '3.1.x'
Diffstat (limited to 'phpBB/includes')
-rw-r--r--phpBB/includes/functions_upload.php2
1 files changed, 2 insertions, 0 deletions
diff --git a/phpBB/includes/functions_upload.php b/phpBB/includes/functions_upload.php
index 21a6de7a41..78e937abea 100644
--- a/phpBB/includes/functions_upload.php
+++ b/phpBB/includes/functions_upload.php
@@ -219,6 +219,8 @@ class filespec
*/
static public function get_extension($filename)
{
+ $filename = utf8_basename($filename);
+
if (strpos($filename, '.') === false)
{
return '';