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/Wall_attach.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/Wall_attach.php')
| -rw-r--r-- | Zotlabs/Module/Wall_attach.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Zotlabs/Module/Wall_attach.php b/Zotlabs/Module/Wall_attach.php index 0ede3ad90..780e82950 100644 --- a/Zotlabs/Module/Wall_attach.php +++ b/Zotlabs/Module/Wall_attach.php @@ -86,7 +86,7 @@ class Wall_attach extends \Zotlabs\Web\Controller { $def_attach = get_pconfig($channel['channel_id'],'system','attach_path'); $r = attach_store($channel,(($observer) ? $observer['xchan_hash'] : ''),'', array('source' => 'editor', 'visible' => 0, 'album' => $def_album, 'directory' => $def_attach, 'allow_cid' => '<' . $channel['channel_hash'] . '>')); - + if(! $r['success']) { notice( $r['message'] . EOL); killme(); @@ -111,7 +111,7 @@ class Wall_attach extends \Zotlabs\Web\Controller { } if(strpos($r['data']['filetype'],'audio') === 0) { $url = z_root() . '/cloud/' . $channel['channel_address'] . '/' . $r['data']['display_path']; - echo "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; + $s = "\n\n" . '[zaudio]' . $url . '[/zaudio]' . "\n\n"; } $s .= "\n\n" . '[attachment]' . $r['data']['hash'] . ',' . $r['data']['revision'] . '[/attachment]' . "\n"; |