diff options
| author | zotlabs <mike@macgirvin.com> | 2018-07-18 19:14:21 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2018-07-18 19:14:21 -0700 |
| commit | 13d19d42cbdf9af34784ee991f7c0c11384ad504 (patch) | |
| tree | 700ad3d11c0a1720bc776004d68fda3b3a68dddf /include | |
| parent | ec852b0c8d6c8e566b2a5fb279ed359630afb5ee (diff) | |
| parent | eb322e831297ee8fd773049c1a00c915c49dc93e (diff) | |
| download | volse-hubzilla-13d19d42cbdf9af34784ee991f7c0c11384ad504.tar.gz volse-hubzilla-13d19d42cbdf9af34784ee991f7c0c11384ad504.tar.bz2 volse-hubzilla-13d19d42cbdf9af34784ee991f7c0c11384ad504.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into xdev_merge
Diffstat (limited to 'include')
| -rw-r--r-- | include/attach.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index 2a9badaac..202412263 100644 --- a/include/attach.php +++ b/include/attach.php @@ -2325,6 +2325,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { return false; $newdirname = $n[0]['filename']; + $newalbumname = $n[0]['display_path']; $newstorepath = dbunescbin($n[0]['content']) . '/' . $resource_id; } else { @@ -2332,6 +2333,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { // root directory $newdirname = EMPTY_STR; + $newalbumname = EMPTY_STR; $newstorepath = 'store/' . $c['channel_address'] . '/' . $resource_id; } @@ -2419,7 +2421,7 @@ function attach_move($channel_id, $resource_id, $new_folder_hash) { if($r[0]['is_photo']) { $t = q("update photo set album = '%s', filename = '%s', os_path = '%s', display_path = '%s' where resource_id = '%s' and uid = %d", - dbesc($newdirname), + dbesc($newalbumname), dbesc($filename), dbesc($x['os_path']), dbesc($x['path']), |