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

closes #4014

Browse Source
This commit is contained in:
barisusakli
2016-02-01 20:34:21 +02:00
parent 2b5f9d075b
commit 1e2779d326
3 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/authentication.js
View File

@@ -92,8 +92,6 @@ function registerAndLoginUser(req, res, userData, callback) {
user.deleteInvitation(userData.email); user.deleteInvitation(userData.email);
user.notifications.sendWelcomeNotification(uid);
plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer || nconf.get('relative_path') + '/'}, next); plugins.fireHook('filter:register.complete', {uid: uid, referrer: req.body.referrer || nconf.get('relative_path') + '/'}, next);
} }
], callback); ], callback);

22
src/user/approval.js
View File

@@ -1,17 +1,16 @@
'use strict'; 'use strict';
var async = require('async'), var async = require('async');
nconf = require('nconf'), var request = require('request');
request = require('request'),
db = require('../database'), var db = require('../database');
meta = require('../meta'), var meta = require('../meta');
emailer = require('../emailer'), var emailer = require('../emailer');
notifications = require('../notifications'), var notifications = require('../notifications');
groups = require('../groups'), var groups = require('../groups');
translator = require('../../public/src/modules/translator'), var translator = require('../../public/src/modules/translator');
utils = require('../../public/src/utils'); var utils = require('../../public/src/utils');
module.exports = function(User) { module.exports = function(User) {
@@ -90,9 +89,6 @@ module.exports = function(User) {
emailer.send('registration_accepted', uid, data, next); emailer.send('registration_accepted', uid, data, next);
}); });
}, },
function(next) {
User.notifications.sendWelcomeNotification(uid, next);
},
function(next) { function(next) {
removeFromQueue(username, next); removeFromQueue(username, next);
}, },

3
src/user/create.js
View File

@@ -98,6 +98,9 @@ module.exports = function(User) {
function(next) { function(next) {
groups.join('registered-users', userData.uid, next); groups.join('registered-users', userData.uid, next);
}, },
function(next) {
user.notifications.sendWelcomeNotification(uid, next);
},
function(next) { function(next) {
if (userData.email) { if (userData.email) {
async.parallel([ async.parallel([