- removed group settings from roles

- added forum icon in front of forums in permissions acp
- added trace permissions in permission masks (thanks naderman for writing the first code and for the idea... :))
- some bugfixes
- PHP6 fix


git-svn-id: file:///svn/phpbb/trunk@5824 89ea8834-ac86-4346-8a33-228a782c2dd0

phpBB/includes/functions_upload.php

@@ -169,19 +169,15 @@ class filespec
 	*/
 	function get_mimetype($filename)
 	{
+		$mimetype = '';
+
 		if (function_exists('mime_content_type'))
 		{
 			$mimetype = mime_content_type($filename);
 		}
-		else
-		{
-			$mimetype = 'application/octetstream';
-		}
 
-		// Opera adds the name to the mime type
-		$mimetype = (strpos($mimetype, '; name') !== false) ? str_replace(strstr($mimetype, '; name'), '', $mimetype) : $mimetype;
-
-		if (!$mimetype)
+		// Some browsers choke on a mimetype of application/octet-stream
+		if (!$mimetype || $mimetype == 'application/octet-stream')
 		{
 			$mimetype = 'application/octetstream';
 		}