Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-06 15:17:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into persona

Browse Source
This commit is contained in:
psychobunny
2015-03-17 16:16:56 -04:00
parent adbbbb3602 37fe438c63
commit 075611ca4b
3 changed files with 7 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/controllers/index.js
View File

@@ -52,15 +52,18 @@ Controllers.home = function(req, res, next) {
Controllers.reset = function(req, res, next) {
if (req.params.code) {
user.reset.validate(req.params.code, function(err, valid) {
if (err) {
return next(err);
}
res.render('reset_code', {
valid: valid,
reset_code: req.params.code ? req.params.code : null,
code: req.params.code ? req.params.code : null,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]', url: '/reset'}, {text: '[[reset_password:update_password]]'}])
});
});
} else {
res.render('reset', {
reset_code: req.params.code ? req.params.code : null,
code: req.params.code ? req.params.code : null,
breadcrumbs: helpers.buildBreadcrumbs([{text: '[[reset_password:reset_password]]'}])
});
}