From c2b5bd3c379056186633d9127507ecb2c37534df Mon Sep 17 00:00:00 2001
From: agree <37550360+greenbea@users.noreply.github.com>
Date: Thu, 19 Dec 2019 12:13:07 -0500
Subject: [PATCH 1/2] Update message_delete.php

---
 app/messages/message_delete.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/messages/message_delete.php b/app/messages/message_delete.php
index 5b74951270..eb31b8249c 100644
--- a/app/messages/message_delete.php
+++ b/app/messages/message_delete.php
@@ -49,13 +49,18 @@
 			foreach ($message_uuids as $index => $message_uuid) {
 				$array['messages'][$index]['message_uuid'] = $message_uuid;
 				$array['messages'][$index]['domain_uuid'] = $domain_uuid;
+				$array['message_media'][$index]['message_uuid'] = $message_uuid;
 			}
-
+			
+			$p = new permissions;
+			$p->add('message_media_delete', 'temp');
 			$database = new database;
 			$database->app_name = 'messages';
 			$database->app_uuid = '4a20815d-042c-47c8-85df-085333e79b87';
 			$database->delete($array);
 			unset($array);
+			
+			$p->delete('message_media_delete', 'temp');
 
 		//set message
 			message::add($text['message-delete']);
@@ -66,4 +71,4 @@
 	header('Location: messages_log.php');
 	exit;
 
-?>
\ No newline at end of file
+?>

From c57afbdc659bdfe11542ca20cb15eb22630e3928 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Thu, 19 Dec 2019 13:03:55 -0500
Subject: [PATCH 2/2] Messages: Include media in delete.

Thanks!
---
 app/messages/message_delete.php | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/app/messages/message_delete.php b/app/messages/message_delete.php
index eb31b8249c..2ef536fd87 100644
--- a/app/messages/message_delete.php
+++ b/app/messages/message_delete.php
@@ -45,21 +45,26 @@
 //delete the message
 	if (is_array($message_uuids) && @sizeof($message_uuids) != 0) {
 
-		//delete message
+		//build delete array
 			foreach ($message_uuids as $index => $message_uuid) {
 				$array['messages'][$index]['message_uuid'] = $message_uuid;
 				$array['messages'][$index]['domain_uuid'] = $domain_uuid;
 				$array['message_media'][$index]['message_uuid'] = $message_uuid;
+				$array['message_media'][$index]['domain_uuid'] = $domain_uuid;
 			}
-			
+		
+		//grant temporary permissions
 			$p = new permissions;
 			$p->add('message_media_delete', 'temp');
+		
+		//execute delete
 			$database = new database;
 			$database->app_name = 'messages';
 			$database->app_uuid = '4a20815d-042c-47c8-85df-085333e79b87';
 			$database->delete($array);
 			unset($array);
-			
+		
+		//revoke temporary permissions
 			$p->delete('message_media_delete', 'temp');
 
 		//set message