diff options
| author | zotlabs <mike@macgirvin.com> | 2017-11-15 12:41:03 -0800 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-11-15 12:41:03 -0800 |
| commit | cf4588f16fbe6dc55eabdb590480bc88d560dad3 (patch) | |
| tree | c056ad6dd6a173d342b6b86252e086e7d68271da /include/attach.php | |
| parent | d43542dd7a64136626550ba0569b1939b84b8146 (diff) | |
| parent | 601f1eb624fce19a1da966e0e102b208a6ae7b74 (diff) | |
| download | volse-hubzilla-cf4588f16fbe6dc55eabdb590480bc88d560dad3.tar.gz volse-hubzilla-cf4588f16fbe6dc55eabdb590480bc88d560dad3.tar.bz2 volse-hubzilla-cf4588f16fbe6dc55eabdb590480bc88d560dad3.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
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) { |