mirror of
				https://github.com/NodeBB/NodeBB.git
				synced 2025-10-31 11:05:54 +01:00 
			
		
		
		
	change requireEmail default to off
This commit is contained in:
		| @@ -176,7 +176,7 @@ var bcrypt = require('bcryptjs'), | |||||||
| 				return callback(new Error('[[error:no-user]]')); | 				return callback(new Error('[[error:no-user]]')); | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
| 			if (userData.email && (parseInt(meta.config.requireEmailConfirmation, 10) === 1 || meta.config.requireEmailConfirmation === undefined) && parseInt(userData['email:confirmed'], 10) !== 1) { | 			if (userData.email && parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) { | ||||||
| 				return callback(new Error('[[error:email-not-confirmed]]')); | 				return callback(new Error('[[error:email-not-confirmed]]')); | ||||||
| 			} | 			} | ||||||
|  |  | ||||||
|   | |||||||
| @@ -137,7 +137,7 @@ module.exports = function(User) { | |||||||
|  |  | ||||||
| 					if (userData.email !== undefined) { | 					if (userData.email !== undefined) { | ||||||
| 						db.setObjectField('email:uid', userData.email, uid); | 						db.setObjectField('email:uid', userData.email, uid); | ||||||
| 						if (parseInt(uid, 10) !== 1 && (parseInt(meta.config.requireEmailConfirmation, 10) === 1 || meta.config.requireEmailConfirmation === undefined)) { | 						if (parseInt(uid, 10) !== 1 && parseInt(meta.config.requireEmailConfirmation, 10) === 1) { | ||||||
| 							User.email.verify(uid, userData.email); | 							User.email.verify(uid, userData.email); | ||||||
| 						} | 						} | ||||||
| 					} | 					} | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user