Merge branch 'pull'

diff --git a/boot.php b/boot.php
index c2c99a55ec953391661cb1ac499817748dc3f4f8..74e46599ff17b4535d9878c140a9617ed5624e39 100755 (executable)
--- a/boot.php
+++ b/boot.php
@@ -9,7 +9,7 @@ require_once('include/nav.php');
 require_once('include/cache.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '2.3.1237' );
+define ( 'FRIENDICA_VERSION',      '2.3.1238' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.22'    );
 define ( 'DB_UPDATE_VERSION',      1118      );
 

diff --git a/include/attach.php b/include/attach.php
index 4001d2af1351bd7f92714ad3263357365b3eee46..6d611cec0418534ce50f80bae09c0c3d7189587f 100755 (executable)
--- a/include/attach.php
+++ b/include/attach.php
@@ -38,6 +38,7 @@ function z_mime_content_type($filename) {
 
                // audio/video
                'mp3' => 'audio/mpeg',
+               'wav' => 'audio/wav',
                'qt' => 'video/quicktime',
                'mov' => 'video/quicktime',
                'ogg' => 'application/ogg',
@@ -68,12 +69,13 @@ function z_mime_content_type($filename) {
                        return $mime_types[$ext];
                }
        }
-       elseif (function_exists('finfo_open')) {
-               $finfo = finfo_open(FILEINFO_MIME);
-               $mimetype = finfo_file($finfo, $filename);
-               finfo_close($finfo);
-               return $mimetype;
-       }
+// can't use this because we're just passing a name, e.g. not a file that can be opened
+//     elseif (function_exists('finfo_open')) {
+//             $finfo = @finfo_open(FILEINFO_MIME);
+//             $mimetype = @finfo_file($finfo, $filename);
+//             @finfo_close($finfo);
+//             return $mimetype;
+//     }
        else {
                return 'application/octet-stream';
        }

diff --git a/mod/wall_attach.php b/mod/wall_attach.php
index a66ed0d059c6d36970d0f77ff2796541e68a301a..ecf4752915f22a85abee826d9534122433a38fcb 100755 (executable)
--- a/mod/wall_attach.php
+++ b/mod/wall_attach.php
@@ -61,8 +61,6 @@ function wall_attach_post(&$a) {
 
        $filedata = @file_get_contents($src);
        $mimetype = z_mime_content_type($filename);
-       if(((! strlen($mimetype)) || ($mimetype === 'application/octet-stream')) && function_exists('mime_content_type'))
-               $mimetype = mime_content_type($filename);
        $hash = random_string();
        $created = datetime_convert();
        $r = q("INSERT INTO `attach` ( `uid`, `hash`, `filename`, `filetype`, `filesize`, `data`, `created`, `edited`, `allow_cid`, `allow_gid`,`deny_cid`, `deny_gid` )