Merge remote-tracking branch 'upstream/develop' into write-tags

src/Model/Mail.php

@@ -92,7 +92,7 @@ class Mail
 			'to_email' => $user['email'],
 			'uid' => $user['uid'],
 			'item' => $msg,
-			'parent' => 0,
+			'parent' => $msg['id'],
 			'source_name' => $msg['from-name'],
 			'source_link' => $msg['from-url'],
 			'source_photo' => $msg['from-photo'],

src/Model/Register.php

@@ -56,7 +56,7 @@ class Register
 	 */
 	public static function getPendingForUser(int $uid)
 	{
-		return DBA::selectToArray('pending-view', [], ['uid' => $uid]);
+		return DBA::selectFirst('pending-view', [], ['uid' => $uid, 'self' => true]);
 	}
 
 	/**