From 5ed6b5c4142489bfd4c39fe2c0ecb9573f80eeba Mon Sep 17 00:00:00 2001
From: acardinale <acardinale@users.noreply.github.com>
Date: Tue, 7 Nov 2017 15:17:27 +0100
Subject: [PATCH] Add User (uid) Welcome Notification (#6045)

---
 public/language/en-GB/admin/settings/notifications.json | 3 ++-
 src/user/notifications.js                               | 1 +
 src/views/admin/settings/notifications.tpl              | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/language/en-GB/admin/settings/notifications.json b/public/language/en-GB/admin/settings/notifications.json
index 4eff7f341a..da6c9680a3 100644
--- a/public/language/en-GB/admin/settings/notifications.json
+++ b/public/language/en-GB/admin/settings/notifications.json
@@ -1,5 +1,6 @@
 {
 	"notifications": "Notifications",
 	"welcome-notification": "Welcome Notification",
-	"welcome-notification-link": "Welcome Notification Link"
+	"welcome-notification-link": "Welcome Notification Link",
+	"welcome-notification-uid": "Welcome Notification User (UID)"
 }
\ No newline at end of file
diff --git a/src/user/notifications.js b/src/user/notifications.js
index a446a9a822..04bc0fae9f 100644
--- a/src/user/notifications.js
+++ b/src/user/notifications.js
@@ -320,6 +320,7 @@ UserNotifications.sendWelcomeNotification = function (uid, callback) {
 				bodyShort: meta.config.welcomeNotification,
 				path: path,
 				nid: 'welcome_' + uid,
+				from: meta.config.welcomeUid ? meta.config.welcomeUid : null,
 			}, next);
 		},
 		function (notification, next) {
diff --git a/src/views/admin/settings/notifications.tpl b/src/views/admin/settings/notifications.tpl
index 803922d17b..3e68295699 100644
--- a/src/views/admin/settings/notifications.tpl
+++ b/src/views/admin/settings/notifications.tpl
@@ -6,6 +6,7 @@
 		<form>
 			<strong>[[admin/settings/notifications:welcome-notification]]</strong><br /> <textarea class="form-control" data-field="welcomeNotification"></textarea><br />
 			<strong>[[admin/settings/notifications:welcome-notification-link]]</strong><br /> <input type="text" class="form-control" data-field="welcomeLink"><br />
+			<strong>[[admin/settings/notifications:welcome-notification-uid]]</strong><br /> <input type="text" class="form-control" data-field="welcomeUid"><br />
 		</form>
 	</div>
 </div>