Merge branch '2021.03-rc' into copyright-2021

2021-03-29 08:45:21 +02:00
parent 054c301ef0 1e71398c72
commit befc2af504
22 changed files with 41829 additions and 40547 deletions
--- a/src/Protocol/ActivityPub/Transmitter.php
+++ b/src/Protocol/ActivityPub/Transmitter.php
@@ -1330,7 +1330,7 @@ class Transmitter
 			return $match[0];
 		}

-		return '[url=' . ($data['alias'] ?: $data['url']) . ']@' . $data['nick'] . '[/url]';
+		return '[url=' . $data['url'] . ']@' . $data['nick'] . '[/url]';
 	}

 	/**