From d839f291ac7d54088c4d09c43af0a75bff92cc27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?=
 <baris@nodebb.org>
Date: Sun, 29 May 2016 22:45:12 +0300
Subject: [PATCH] closes #4706

---
 public/language/en_GB/notifications.json | 3 ---
 src/notifications.js                     | 3 +--
 src/socket.io/posts/favourites.js        | 4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/public/language/en_GB/notifications.json b/public/language/en_GB/notifications.json
index 07ec757374..5a2ed58908 100644
--- a/public/language/en_GB/notifications.json
+++ b/public/language/en_GB/notifications.json
@@ -18,9 +18,6 @@
 	"upvoted_your_post_in_multiple": "<strong>%1</strong> and %2 others have upvoted your post in <strong>%3</strong>.",
 	"moved_your_post": "<strong>%1</strong> has moved your post to <strong>%2</strong>",
 	"moved_your_topic": "<strong>%1</strong> has moved <strong>%2</strong>",
-	"favourited_your_post_in": "<strong>%1</strong> has bookmarked your post in <strong>%2</strong>.",
-	"favourited_your_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> have bookmarked your post in <strong>%3</strong>.",
-	"favourited_your_post_in_multiple": "<strong>%1</strong> and %2 others have bookmarked your post in <strong>%3</strong>.",
 	"user_flagged_post_in": "<strong>%1</strong> flagged a post in <strong>%2</strong>",
 	"user_flagged_post_in_dual": "<strong>%1</strong> and <strong>%2</strong> flagged a post in <strong>%3</strong>",
 	"user_flagged_post_in_multiple": "<strong>%1</strong> and %2 others flagged a post in <strong>%3</strong>",
diff --git a/src/notifications.js b/src/notifications.js
index 7ca9c50277..f95eb52248 100644
--- a/src/notifications.js
+++ b/src/notifications.js
@@ -428,7 +428,6 @@ var utils = require('../public/src/utils');
 	Notifications.merge = function(notifications, callback) {
 		// When passed a set of notification objects, merge any that can be merged
 		var mergeIds = [
-				'notifications:favourited_your_post_in',
 				'notifications:upvoted_your_post_in',
 				'notifications:user_started_following_you',
 				'notifications:user_posted_to',
@@ -475,7 +474,7 @@ var utils = require('../public/src/utils');
 				}
 
 				switch(mergeId) {
-					case 'notifications:favourited_your_post_in':	// intentional fall-through
+					// intentional fall-through
 					case 'notifications:upvoted_your_post_in':
 					case 'notifications:user_started_following_you':
 					case 'notifications:user_posted_to':
diff --git a/src/socket.io/posts/favourites.js b/src/socket.io/posts/favourites.js
index 01be736949..c3c4f23de9 100644
--- a/src/socket.io/posts/favourites.js
+++ b/src/socket.io/posts/favourites.js
@@ -92,7 +92,7 @@ module.exports = function(SocketPosts) {
 	};
 
 	SocketPosts.favourite = function(socket, data, callback) {
-		favouriteCommand(socket, 'favourite', 'favourited', 'notifications:favourited_your_post_in', data, callback);
+		favouriteCommand(socket, 'favourite', 'favourited', '', data, callback);
 	};
 
 	SocketPosts.unfavourite = function(socket, data, callback) {
@@ -103,7 +103,7 @@ module.exports = function(SocketPosts) {
 		if (!socket.uid) {
 			return callback(new Error('[[error:not-logged-in]]'))
 		}
-		if(!data || !data.pid || !data.room_id) {
+		if (!data || !data.pid || !data.room_id) {
 			return callback(new Error('[[error:invalid-data]]'));
 		}
 		async.parallel({