Only process messages to set user’s name when necessary

packages/rocketchat-lib/server/functions/setRealName.js

@@ -15,11 +15,13 @@ RocketChat._setRealName = function(userId, name) {
 	RocketChat.models.Users.setName(user._id, name);
 	user.name = name;
 
-	RocketChat.Notifications.notifyLogged('Users:NameChanged', {
-		_id: user._id,
-		name: user.name,
-		username: user.username
-	});
+	if (RocketChat.settings.get('UI_Use_Real_Name') === true) {
+		RocketChat.Notifications.notifyLogged('Users:NameChanged', {
+			_id: user._id,
+			name: user.name,
+			username: user.username
+		});
+	}
 
 	return user;
 };

packages/rocketchat-lib/server/methods/getChannelHistory.js

@@ -49,9 +49,11 @@ Meteor.methods({
 			records = RocketChat.models.Messages.findVisibleByRoomIdBetweenTimestamps(rid, oldest, latest, options).fetch();
 		}
 
+		const UI_Use_Real_Name = RocketChat.settings.get('UI_Use_Real_Name') === true;
+
 		const messages = _.map(records, (message) => {
 			message.starred = _.findWhere(message.starred, { _id: fromUserId });
-			if (message.u && message.u._id) {
+			if (message.u && message.u._id && UI_Use_Real_Name) {
 				const user = RocketChat.models.Users.findOneById(message.u._id);
 				message.u.name = user && user.name;
 			}

server/methods/loadHistory.js

@@ -58,11 +58,13 @@ Meteor.methods({
 			records = RocketChat.models.Messages.findVisibleByRoomIdNotContainingTypes(rid, hideMessagesOfType, options).fetch();
 		}
 
+		const UI_Use_Real_Name = RocketChat.settings.get('UI_Use_Real_Name') === true;
+
 		const messages = records.map((message) => {
 			message.starred = _.findWhere(message.starred, {
 				_id: fromId
 			});
-			if (message.u && message.u._id) {
+			if (message.u && message.u._id && UI_Use_Real_Name) {
 				const user = RocketChat.models.Users.findOneById(message.u._id);
 				message.u.name = user && user.name;
 			}