diff options
| author | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
|---|---|---|
| committer | Wave <wave72@users.noreply.github.com> | 2015-12-20 10:20:36 +0100 |
| commit | 2aad4c2cf9c17a7532089aadfcc5feff6505ec74 (patch) | |
| tree | 2082c8dc7ba090f610874b6e33b0f1092a2ff00c /include/attach.php | |
| parent | 474a1267d73c1dcf00678dd15ed4e0e37496473d (diff) | |
| parent | e2692a4baaf031bd0d9c0893c3762637b1f6b201 (diff) | |
| download | volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.gz volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.tar.bz2 volse-hubzilla-2aad4c2cf9c17a7532089aadfcc5feff6505ec74.zip | |
Merge pull request #4 from redmatrix/master
Merge master into dev branch
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') { |