X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fmessage.php;h=3ff84a1e6684478b2200d2c552451aad2d2401c3;hb=41663c7592abe55a958632c3a48265e0a8544d2b;hp=0a80773c739f8126c6fe8a8c09f039c87d760f8c;hpb=5abc22f6c536b4fea7a5becd53561959ba0e7512;p=friendica.git

diff --git a/mod/message.php b/mod/message.php
index 0a80773c73..3ff84a1e66 100644
--- a/mod/message.php
+++ b/mod/message.php
@@ -185,7 +185,6 @@ function message_content(App $a)
 			);
 			if (DBA::isResult($r)) {
 				$parent = $r[0]['parent-uri'];
-				$convid = $r[0]['convid'];
 
 				if (DBA::delete('mail', ['parent-uri' => $parent, 'uid' => local_user()])) {
 					info(L10n::t('Conversation removed.') . EOL);
@@ -230,7 +229,6 @@ function message_content(App $a)
 
 			if (DBA::isResult($r)) {
 				$prename = $r[0]['name'];
-				$preurl = $r[0]['url'];
 				$preid = $r[0]['id'];
 				$preselect = [$preid];
 			} else {
@@ -339,6 +337,13 @@ function message_content(App $a)
 			$messages = DBA::toArray($messages_stmt);
 
 			DBA::update('mail', ['seen' => 1], ['parent-uri' => $message['parent-uri'], 'uid' => local_user()]);
+
+			if ($message['convid']) {
+				// Clear Diaspora private message notifications
+				DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['convid'], 'uid' => local_user()]);
+			}
+			// Clear DFRN private message notifications
+			DBA::update('notify', ['seen' => 1], ['type' => NOTIFY_MAIL, 'parent' => $message['parent-uri'], 'uid' => local_user()]);
 		} else {
 			$messages = false;
 		}
@@ -495,7 +500,7 @@ function get_messages($uid, $start, $limit)
 
 function render_messages(array $msg, $t)
 {
-	$a = get_app();
+	$a = \get_app();
 
 	$tpl = Renderer::getMarkupTemplate($t);
 	$rslt = '';