aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2013-11-12 00:35:52 +0100
committerMarc Alexander <admin@m-a-styles.de>2013-11-12 00:35:52 +0100
commite380eed78e6f3076c5d7cb3df3a016165781e73d (patch)
tree42f661f968775968512c75db5098029b1e90d4f4
parent95b22819a7c0f6bddee0f6b095f8bf777ef653b6 (diff)
downloadforums-e380eed78e6f3076c5d7cb3df3a016165781e73d.tar
forums-e380eed78e6f3076c5d7cb3df3a016165781e73d.tar.gz
forums-e380eed78e6f3076c5d7cb3df3a016165781e73d.tar.bz2
forums-e380eed78e6f3076c5d7cb3df3a016165781e73d.tar.xz
forums-e380eed78e6f3076c5d7cb3df3a016165781e73d.zip
[ticket/11912] Remove obsolete variable $mimetype from content_guesser
PHPBB3-11912
-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
}
}