diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-10-14 15:08:07 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-10-14 15:08:07 -0700 |
| commit | 8af3dc140e34094ce101f050feb3da2b8b39470b (patch) | |
| tree | 1ec87a0d7ec51c9b3dccc033df36438c469de284 /include | |
| parent | de697a42671e3c50106dab29eb108a122753a825 (diff) | |
| download | volse-hubzilla-8af3dc140e34094ce101f050feb3da2b8b39470b.tar.gz volse-hubzilla-8af3dc140e34094ce101f050feb3da2b8b39470b.tar.bz2 volse-hubzilla-8af3dc140e34094ce101f050feb3da2b8b39470b.zip | |
issue #87 - photos not getting deleted from mod_photo when deleted in DAV or cloud
Diffstat (limited to 'include')
| -rw-r--r-- | include/attach.php | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/attach.php b/include/attach.php index fc95e3a75..0d4e4092b 100644 --- a/include/attach.php +++ b/include/attach.php @@ -1229,7 +1229,7 @@ function attach_delete($channel_id, $resource, $is_photo = 0) { $channel_address = (($c) ? $c[0]['channel_address'] : 'notfound'); $photo_sql = (($is_photo) ? " and is_photo = 1 " : ''); - $r = q("SELECT hash, flags, is_dir, folder FROM attach WHERE hash = '%s' AND uid = %d $photo_sql limit 1", + $r = q("SELECT hash, flags, is_dir, is_photo, folder FROM attach WHERE hash = '%s' AND uid = %d $photo_sql limit 1", dbesc($resource), intval($channel_id) ); @@ -1275,6 +1275,16 @@ function attach_delete($channel_id, $resource, $is_photo = 0) { intval($channel_id) ); + if($r[0]['is_photo']) { + $x = q("select id, item_hidden from item where resource_id = '%s' and resource_type = 'photo' and uid = %d", + dbesc($resource), + intval($channel_id) + ); + if($x) { + drop_item($x[0]['id'],false,(($x[0]['item_hidden']) ? DROPITEM_NORMAL : DROPITEM_PHASE1),true); + } + } + // update the parent folder's lastmodified timestamp $e = q("UPDATE attach SET edited = '%s' WHERE hash = '%s' AND uid = %d", dbesc(datetime_convert()), |