diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2014-08-10 01:30:58 +0200 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2014-08-10 01:30:58 +0200 |
| commit | ab2878b37b711c0eb2faed4f7b2db55145b7044c (patch) | |
| tree | c0d37ea21c29f418237c519dc0a9f72dfa757d87 | |
| parent | 59b5ab4866e4c687c9157898110fd0e556f6c6ac (diff) | |
| parent | 5c93735557ebca850ecd588745e9ab9295a536b5 (diff) | |
| download | forums-ab2878b37b711c0eb2faed4f7b2db55145b7044c.tar forums-ab2878b37b711c0eb2faed4f7b2db55145b7044c.tar.gz forums-ab2878b37b711c0eb2faed4f7b2db55145b7044c.tar.bz2 forums-ab2878b37b711c0eb2faed4f7b2db55145b7044c.tar.xz forums-ab2878b37b711c0eb2faed4f7b2db55145b7044c.zip | |
Merge branch 'develop-ascraeus' into develop
# By Marc Alexander
# Via Dhruv Goel (1) and Marc Alexander (1)
* develop-ascraeus:
[ticket/12949] Check if mime_content_type is actually callable
| -rw-r--r-- | phpBB/phpbb/mimetype/content_guesser.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/phpbb/mimetype/content_guesser.php b/phpBB/phpbb/mimetype/content_guesser.php index 9c83e8dd73..f3ad7f5f41 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 function_exists('mime_content_type'); + return function_exists('mime_content_type') && is_callable('mime_content_type'); } /** |