change deletion behaviour of linked photo items. Previously deleting the visible item in the conversation deleted the photo as well. Now photos must be deleted in the photos module. Deleting the linked item removes any attached conversation elements (likes, etc.) and sets the conversation item to hidden. This may create an issue in the future if we move the photo tags, title, or other photo elements to the linked item rather than the photo. Noting here so this can potentially be discovered and remembered at that time.

2 files changed, 13 insertions, 29 deletions

diff --git a/include/items.php b/include/items.php
index 4c533aedc..e9e78acc5 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3939,7 +3939,7 @@ function drop_items($items) {
 // $stage = 1 => set deleted flag on the item and perform intial notifications
 // $stage = 2 => perform low level delete at a later stage
 
-function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
+function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL,$force = false) {
 
 
 	$a = get_app();
@@ -3959,6 +3959,8 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
 
 	$item = $r[0];
 
+	$linked_item = (($item['resource_id']) ? true : false);
+
 	$ok_to_delete = false;
 
 	// system deletion
@@ -3980,10 +3982,11 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
 		// hook calls a remote process which loops. We'll delete it properly in a second.
 
 		$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ) WHERE id = %d",
-			intval(ITEM_DELETED),
+			intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
 			intval($item['id'])
 		);
 
+
 		$arr = array('item' => $item, 'interactive' => $interactive, 'stage' => $stage);
 		call_hooks('drop_item', $arr );
 
@@ -3995,10 +3998,10 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
 		);
 		if($items) {
 			foreach($items as $i)
-				delete_item_lowlevel($i,$stage);
+				delete_item_lowlevel($i,$stage,$force);
 		}
 		else
-			delete_item_lowlevel($item,$stage);
+			delete_item_lowlevel($item,$stage,$force);
 
 		if(! $interactive)
 			return 1;
@@ -4030,8 +4033,9 @@ function drop_item($id,$interactive = true,$stage = DROPITEM_NORMAL) {
 // It merely destroys all resources associated with an item. 
 // Please do not use without a suitable wrapper.
 
-function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
+function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL,$force = false) {
 
+	$linked_item = (($item['resource_id']) ? true : false);
 
 	switch($stage) {
 		case DROPITEM_PHASE2:
@@ -4047,7 +4051,7 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
 		case DROPITEM_PHASE1:
 			$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ),
 				changed = '%s', edited = '%s'  WHERE id = %d",
-				intval(ITEM_DELETED),
+				intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
 				intval($item['id'])
@@ -4058,7 +4062,7 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
 		default:
 			$r = q("UPDATE item SET item_restrict = ( item_restrict | %d ), body = '', title = '',
 				changed = '%s', edited = '%s'  WHERE id = %d",
-				intval(ITEM_DELETED),
+				intval(($linked_item && ! $force) ? ITEM_HIDDEN : ITEM_DELETED),
 				dbesc(datetime_convert()),
 				dbesc(datetime_convert()),
 				intval($item['id'])
@@ -4074,25 +4078,6 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
 		intval($item['uid'])
 	);
 
-	// If item is a link to a photo/event resource, nuke all the associated photos/events 
-	// This only applies to photos uploaded from the photos page. Photos inserted into a post do not
-	// generate a resource_id and therefore aren't intimately linked to the item. 
-
-	if(strlen($item['resource_id'])) {
-		if($item['resource_type'] === 'event') {
-			q("delete from event where event_hash = '%s' and uid = %d",
-				dbesc($item['resource_id']),
-				intval($item['uid'])
-			);				
-		}
-		elseif($item['resource_type'] === 'photo') {
-			q("DELETE FROM `photo` WHERE `resource_id` = '%s' AND `uid` = %d ",
-				dbesc($item['resource_id']),
-				intval($item['uid'])
-			);
-		}
-	}
-
 
 	// network deletion request. Keep the message structure so that we can deliver delete notifications.
 	// Come back after several days (or perhaps a month) to do the lowlevel delete (DROPITEM_PHASE2).
@@ -4115,8 +4100,7 @@ function delete_item_lowlevel($item,$stage = DROPITEM_NORMAL) {
 		intval(TERM_OBJ_POST)
 	);
 
-// FIXME remove notifications for this item
-
+	// FIXME remove notifications for this item
 
 	return true;
 }
diff --git a/mod/photos.php b/mod/photos.php
index df9880c8d..92a2d8e24 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -140,7 +140,7 @@ function photos_post(&$a) {
 			);
 			if($r) {
 				foreach($r as $i) {
-					drop_item($i['id'],false);
+					drop_item($i['id'],false,DROPITEM_PHASE1,true /* force removal of linked items */);
 					if(! $item_restrict)
 						proc_run('php','include/notifier.php','drop',$i['id']);
 				}