[Phpgroupware-cvs] [20948] sync

[Sigurd Nes]

Revision: 20948
          
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=20948
Author:   sigurdne
Date:     2010-01-13 18:57:17 +0000 (Wed, 13 Jan 2010)
Log Message:
-----------
sync

Modified Paths:
--------------
    people/sigurdne/modules/phpgwapi/trunk/inc/class.mime_magic.inc.php

Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.mime_magic.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.mime_magic.inc.php 
2010-01-13 18:25:51 UTC (rev 20947)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.mime_magic.inc.php 
2010-01-13 18:57:17 UTC (rev 20948)
@@ -96,11 +96,8 @@
                        if (is_array($fn_parts))
                        {
                                $type = 
$this->ext2mime($fn_parts[count($fn_parts)-1]);
-                               if ($type != 'application/octect-stream')
-                               {
                                        return $type;
                                }
-                       }
                        return 'application/octet-stream';
                }
                
@@ -311,6 +308,7 @@
                                'movie' => 'video/x-sgi-movie',
                                'mp2'   => 'audio/mpeg',
                                'mp3'   => 'audio/mpeg',
+                               'mp4'   => 'video/mp4', 
                                'mpe'   => 'video/mpeg',
                                'mpeg'  => 'video/mpeg',
                                'mpg'   => 'video/mpeg',