merged master fixed conflicts

This commit is contained in:
Baris Usakli
2013-12-05 12:17:01 -05:00
16 changed files with 407 additions and 50 deletions

View File

@@ -223,7 +223,7 @@ var db = require('./database'),
}
}
plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid}, function(err, profile_info) {
plugins.fireHook('filter:posts.custom_profile_info', {profile: "", uid: post.uid, pid: post.pid}, function(err, profile_info) {
post.additional_profile_info = profile_info.profile;
if (post.editor !== '') {