aboutsummaryrefslogtreecommitdiffstats
path: root/include/attach.php
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2018-07-18 13:18:37 +0200
committerMario <mario@mariovavti.com>2018-07-18 13:20:20 +0200
commit4a6f775334fbf3af2e8e6c781a9a44192a6526d0 (patch)
tree370706f3b1fcbf67891b1dcbb4b871d220ad3aa4 /include/attach.php
parent896d29d0c0426de5327020332f558cfe9390aeec (diff)
downloadvolse-hubzilla-4a6f775334fbf3af2e8e6c781a9a44192a6526d0.tar.gz
volse-hubzilla-4a6f775334fbf3af2e8e6c781a9a44192a6526d0.tar.bz2
volse-hubzilla-4a6f775334fbf3af2e8e6c781a9a44192a6526d0.zip
set the correct album name when moving photos
(cherry picked from commit eb322e831297ee8fd773049c1a00c915c49dc93e)
Diffstat (limited to 'include/attach.php')
-rw-r--r--include/attach.php4
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']),