aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorMario <mario@mariovavti.com>2021-08-30 07:56:00 +0000
committerMario <mario@mariovavti.com>2021-08-30 07:56:00 +0000
commit3fb4077672d0ad81be4c435150dc740b64c64727 (patch)
treeefa30a1780b24b4aab0c82af1812adadffef77c5 /include
parent5532560d07d50cdeef54054c829a4591cf05a8a4 (diff)
parent5b73cee0d8fc331984305eb8461b37d66e4e8335 (diff)
downloadvolse-hubzilla-3fb4077672d0ad81be4c435150dc740b64c64727.tar.gz
volse-hubzilla-3fb4077672d0ad81be4c435150dc740b64c64727.tar.bz2
volse-hubzilla-3fb4077672d0ad81be4c435150dc740b64c64727.zip
Merge branch 'photodir' into 'dev'
file is stored in wrong directory (/) if uploaded using photo module and it... See merge request hubzilla/core!1985
Diffstat (limited to 'include')
-rw-r--r--include/attach.php3
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);
}