Merge pull request #15079 from annando/issue-15047

Issue 15047: Set the notification to seen

src/Module/Notifications/Notification.php

@@ -144,13 +144,13 @@ class Notification extends BaseModule
 			$Notify->setSeen();
 			$this->notifyRepo->save($Notify);
 		} else {
-			if ($Notify->uriId) {
-				$this->notificationRepo->setAllSeenForUser($Notify->uid, ['target-uri-id' => $Notify->uriId]);
-			}
-
 			$this->notifyRepo->setAllSeenForRelatedNotify($Notify);
 		}
 
+		if ($Notify->uriId) {
+			$this->notificationRepo->setAllSeenForUser($Notify->uid, ['target-uri-id' => $Notify->uriId]);
+		}
+
 		if ((string)$Notify->link) {
 			System::externalRedirect($Notify->link);
 		}