1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-22 10:57:56 +01:00

Merge branch '3.1.x'

This commit is contained in:
Marc Alexander 2015-04-26 09:24:09 +02:00
commit 03eae6fddd
2 changed files with 4 additions and 0 deletions

View File

@ -219,6 +219,8 @@ class filespec
*/ */
static public function get_extension($filename) static public function get_extension($filename)
{ {
$filename = utf8_basename($filename);
if (strpos($filename, '.') === false) if (strpos($filename, '.') === false)
{ {
return ''; return '';

View File

@ -216,6 +216,8 @@ class phpbb_filespec_test extends phpbb_test_case
array('file.phpbb.gif', 'gif'), array('file.phpbb.gif', 'gif'),
array('file..', ''), array('file..', ''),
array('.file..jpg.webp', 'webp'), array('.file..jpg.webp', 'webp'),
array('/test.com/file', ''),
array('/test.com/file.gif', 'gif'),
); );
} }