Merge branch 'master' of https://github.com/designcreateplay/NodeBB

public/templates/admin/facebook.tpl

@@ -17,5 +17,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>

public/templates/admin/gplus.tpl

@@ -17,5 +17,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>

public/templates/admin/motd.tpl

@@ -24,5 +24,10 @@
 <button class="btn btn-lg btn-primary" id="save" checked>Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>

public/templates/admin/settings.tpl

@@ -75,5 +75,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>

public/templates/admin/twitter.tpl

@@ -17,5 +17,10 @@
 <button class="btn btn-lg btn-primary" id="save">Save</button>
 
 <script>
-	nodebb_admin.prepare();
+	var	loadDelay = setInterval(function() {
+		if (nodebb_admin) {
+			nodebb_admin.prepare();
+			clearInterval(loadDelay);
+		}
+	}, 500);
 </script>

src/user.js

@@ -584,7 +584,7 @@ var utils = require('./../public/src/utils.js'),
 				topics.getTopicField(tid, 'slug', function(err, slug) {
 					var message = '<strong>' + username + '</strong> made a new post';
 
-					notifications.create(message, 5, nconf.get('relative_path') + '/topic/' + slug + '#' + pid, 'notification_'+ Date.now(), function(nid) {
+					notifications.create(message, 5, nconf.get('relative_path') + '/topic/' + slug + '#' + pid, 'topic:'+ tid, function(nid) {
 		 				notifications.push(nid, followers);
 					});
 				});