diff options
| author | Mario <mario@mariovavti.com> | 2021-09-08 07:43:40 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2021-09-08 07:43:40 +0000 |
| commit | 4c5f0a05c75cc66113f589a3ffe6df351abb1273 (patch) | |
| tree | 15148d08a99f8375992e554a90e6d4333286a7cc /include/attach.php | |
| parent | 952407363e245d41986cfb90e4ccf509bddc7322 (diff) | |
| parent | 977a55eb8423745e4d88257b704d3e36f7337b9f (diff) | |
| download | volse-hubzilla-6.2.tar.gz volse-hubzilla-6.2.tar.bz2 volse-hubzilla-6.2.zip | |
Merge branch '6.2RC'6.2
Diffstat (limited to 'include/attach.php')
| -rw-r--r-- | include/attach.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index 56fb936e7..ef3d6e242 100644 --- a/include/attach.php +++ b/include/attach.php @@ -684,7 +684,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { $pathname = ''; - if($is_photo) { + if($source === 'photos') { if($newalbum) { $pathname = filepath_macro($newalbum); } @@ -698,6 +698,7 @@ function attach_store($channel, $observer_hash, $options = '', $arr = null) { elseif(array_key_exists('folder',$arr)) { $pathname = find_path_by_hash($channel['channel_id'], $arr['folder']); } + if(! $pathname) { $pathname = filepath_macro($upload_path); } |