makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'Fyorl/ticket/10944' into develop

Browse source 
* Fyorl/ticket/10944:
  [ticket/10944] strpos now stricter and removed superfluous ternary
  [ticket/10944] Reverted changes in PHPBB3-10963
This commit is contained in:
Andreas Fischer 2012-07-19 17:16:37 +02:00
commit c896cd06dd
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/functions_upload.php
View file

@ -151,8 +151,7 @@ class filespec
*/ */
function is_image() function is_image()
{ {
$mimetype = $this->get_mimetype($this->filename); return (strpos($this->mimetype, 'image/') === 0);
return (strpos($mimetype, 'image/') === 0);
} }
/** /**
@ -201,12 +200,17 @@ class filespec
} }
/** /**
* Get mimetype. Utilises the finfo class. * Get mimetype. Utilize mime_content_type if the function exist.
* Not used at the moment...
*/ */
function get_mimetype($filename) function get_mimetype($filename)
{ {
$finfo = new finfo(FILEINFO_MIME_TYPE); $mimetype = '';
$mimetype = $finfo->file($filename);
if (function_exists('mime_content_type'))
{
$mimetype = mime_content_type($filename);
}
// Some browsers choke on a mimetype of application/octet-stream // Some browsers choke on a mimetype of application/octet-stream
if (!$mimetype || $mimetype == 'application/octet-stream') if (!$mimetype || $mimetype == 'application/octet-stream')
@ -338,7 +342,6 @@ class filespec
// Remove temporary filename // Remove temporary filename
@unlink($this->filename); @unlink($this->filename);
$this->filename = $this->destination_file;
if (sizeof($this->error)) if (sizeof($this->error))
{ {