Merge branch '2019.01-rc' into bug/6334-escape-get-app

2019-01-06 16:38:48 -05:00
parent b3f8a24819 4bf2701912
commit e447375cdd
27 changed files with 136 additions and 72 deletions
--- a/src/Model/User.php
+++ b/src/Model/User.php
@@ -771,7 +771,7 @@ class User
 			If you ever want to delete your account, you can do so at %3$s/removeme

 			Thank you and welcome to %2$s.',
-			$user['email'], $sitename, $siteurl, $user['username'], $password
+			$user['nickname'], $sitename, $siteurl, $user['username'], $password
 		));

 		return notification([