Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 14:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into user-icons

Browse Source 
Conflicts:
	public/src/client/account/edit.js
	src/middleware/middleware.js
	src/socket.io/meta.js
	src/socket.io/user/picture.js
	src/user.js
	src/views/admin/manage/group.tpl
This commit is contained in:
Julian Lam
2015-10-25 07:33:59 -04:00
parent 167ba64018 a739ad81ab
commit b52475c270
112 changed files with 1769 additions and 1104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/notifications.js
View File

@@ -229,7 +229,7 @@ var async = require('async'),
return callback();
}
db.getObject('notification:' + nid, function(err, notification) {
db.getObject('notifications:' + nid, function(err, notification) {
if (err || !notification) {
return callback(err || new Error('[[error:no-notification]]'));
}