diff options
| author | M. Dent <dentm42@gmail.com> | 2019-11-04 20:01:14 +0100 |
|---|---|---|
| committer | M. Dent <dentm42@gmail.com> | 2019-11-04 20:01:14 +0100 |
| commit | aa137fb2d2ddd71f89eea4618cac1594d020ed3a (patch) | |
| tree | dc9210141cf787893eb5bbd9729b24b56bf4fa4d /Zotlabs/Module/Item.php | |
| parent | 09284d512d2519ede757265c703427d1d1012469 (diff) | |
| parent | 873b20677ed35df291004152fd4e3a0494c478bf (diff) | |
| download | volse-hubzilla-aa137fb2d2ddd71f89eea4618cac1594d020ed3a.tar.gz volse-hubzilla-aa137fb2d2ddd71f89eea4618cac1594d020ed3a.tar.bz2 volse-hubzilla-aa137fb2d2ddd71f89eea4618cac1594d020ed3a.zip | |
Merge branch 'cherry-pick-4cfb9658' into 'dev'
fix duplicate attachment and regression with audio file upload
See merge request hubzilla/core!1766
Diffstat (limited to 'Zotlabs/Module/Item.php')
| -rw-r--r-- | Zotlabs/Module/Item.php | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/Zotlabs/Module/Item.php b/Zotlabs/Module/Item.php index cda8eabec..14881844d 100644 --- a/Zotlabs/Module/Item.php +++ b/Zotlabs/Module/Item.php @@ -817,11 +817,6 @@ class Item extends Controller { 'revision' => $r['data']['revision'] ); } - $ext = substr($r['data']['filename'],strrpos($r['data']['filename'],'.')); - if(strpos($r['data']['filetype'],'audio/') !== false) - $attach_link = '[audio]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/audio]'; - elseif(strpos($r['data']['filetype'],'video/') !== false) - $attach_link = '[video]' . z_root() . '/attach/' . $r['data']['hash'] . '/' . $r['data']['revision'] . (($ext) ? $ext : '') . '[/video]'; $body = str_replace($match[1][$i],$attach_link,$body); $i++; } |