aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--phpBB/phpbb/mimetype/content_guesser.php5
1 files changed, 2 insertions, 3 deletions
diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php
index ea15393b94..623438ee0b 100644
--- a/phpBB/phpbb/mimetype/content_guesser.php
+++ b/phpBB/phpbb/mimetype/content_guesser.php
@@ -28,12 +28,11 @@ class content_guesser extends guesser_base
*/
public function guess($file, $file_name = '')
{
- $mimetype = null;
if (function_exists('mime_content_type'))
{
- $mimetype = mime_content_type($file);
+ return mime_content_type($file);
}
- return $mimetype;
+ return null; // optional
}
}