diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-11-15 10:48:24 +0100 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-11-15 10:48:24 +0100 |
commit | 601f1eb624fce19a1da966e0e102b208a6ae7b74 (patch) | |
tree | c056ad6dd6a173d342b6b86252e086e7d68271da /include/attach.php | |
parent | 301b41eaa4f3087624a57d1471f76d903c604a5b (diff) | |
parent | 8e534918672c2ccf3614623b8bd368d18318f453 (diff) | |
download | volse-hubzilla-601f1eb624fce19a1da966e0e102b208a6ae7b74.tar.gz volse-hubzilla-601f1eb624fce19a1da966e0e102b208a6ae7b74.tar.bz2 volse-hubzilla-601f1eb624fce19a1da966e0e102b208a6ae7b74.zip |
Merge remote-tracking branch 'mike/master' into dev
Diffstat (limited to 'include/attach.php')
-rw-r--r-- | include/attach.php | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/include/attach.php b/include/attach.php index 2bb57722b..96b9c0b44 100644 --- a/include/attach.php +++ b/include/attach.php @@ -588,6 +588,12 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $def_extension = '.png'; } + // If we know it's a photo, over-ride the type in case the source system could not determine what it was + + if($is_photo) { + $type = $gis['mime']; + } + $pathname = ''; if($is_photo) { |