aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-11-23 00:51:29 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-11-23 00:51:29 +0100
commite108418824857e670a92f516285455f79bf6e12a (patch)
treee88a6a30ae6096f6b261658e81750ae07d5bbbbc /phpBB/phpbb
parentdf6e03266fbe13e64a1f889136b6b1244b9111ae (diff)
downloadforums-e108418824857e670a92f516285455f79bf6e12a.tar
forums-e108418824857e670a92f516285455f79bf6e12a.tar.gz
forums-e108418824857e670a92f516285455f79bf6e12a.tar.bz2
forums-e108418824857e670a92f516285455f79bf6e12a.tar.xz
forums-e108418824857e670a92f516285455f79bf6e12a.zip
[ticket/11912] Check if content_guesser is supported with function_exists
PHPBB3-11912
Diffstat (limited to 'phpBB/phpbb')
-rw-r--r--phpBB/phpbb/mimetype/content_guesser.php7
1 files changed, 2 insertions, 5 deletions
diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php
index 60e5a905e2..2d74582a21 100644
--- a/phpBB/phpbb/mimetype/content_guesser.php
+++ b/phpBB/phpbb/mimetype/content_guesser.php
@@ -20,7 +20,7 @@ class content_guesser extends guesser_base
*/
public function is_supported()
{
- return true;
+ return function_exists('mime_content_type');
}
/**
@@ -28,9 +28,6 @@ class content_guesser extends guesser_base
*/
public function guess($file, $file_name = '')
{
- if (function_exists('mime_content_type'))
- {
- return mime_content_type($file);
- }
+ return mime_content_type($file);
}
}