diff options
| author | mrjive <mrjive@mrjive.it> | 2016-01-03 09:52:37 +0100 |
|---|---|---|
| committer | mrjive <mrjive@mrjive.it> | 2016-01-03 09:52:37 +0100 |
| commit | 07f5bdde60f55e3b217aee9e33c3175e90a5f0f1 (patch) | |
| tree | 2b5988c7661c9a5a67f5da8797ca57381e2aad7a /include/attach.php | |
| parent | 051346325609f5f2e78ef0deaf182c65d7823bbc (diff) | |
| parent | 5b0a17359d6b5b3e27219c9e56117f1017996175 (diff) | |
| download | volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.tar.gz volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.tar.bz2 volse-hubzilla-07f5bdde60f55e3b217aee9e33c3175e90a5f0f1.zip | |
Merge pull request #10 from redmatrix/master
updating from original codebase
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index 36b971712..8595d5d86 100644 --- a/include/attach.php +++ b/include/attach.php @@ -430,7 +430,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $observer = $x[0]; } - logger('arr: ' . print_r($arr,true)); + logger('arr: ' . print_r($arr,true), LOGGER_DATA); if(! perm_is_allowed($channel_id,$observer_hash, 'write_storage')) { $ret['message'] = t('Permission denied.'); @@ -503,6 +503,10 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { } } + // AndStatus sends jpegs with a non-standard mimetype + if($type === 'image/jpg') + $type = 'image/jpeg'; + $existing_size = 0; if($options === 'replace') { |