gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

resolve merge conflict

Browse Source
This commit is contained in:
Nathan Leniz
2015-03-21 17:04:31 +09:00
parent 6ad7c22313 ec5b3e4b84
commit 9cdb2588b4
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/story.js
View File

@ -19,7 +19,7 @@ function hotRank(timeValue, rank) {
*/ */
var hotness; var hotness;
var z = Math.log(rank) / Math.log(10); var z = Math.log(rank) / Math.log(10);
hotness = z + (timeValue / 45000000); hotness = z + (timeValue / 172800000);
return hotness; return hotness;
} }

13
controllers/user.js
View File

@ -94,12 +94,15 @@ exports.getEmailSignup = function(req, res) {
*/ */
exports.postEmailSignup = function(req, res, next) { exports.postEmailSignup = function(req, res, next) {
var errors = req.validationErrors();
if (errors) {
req.flash('errors', errors); req.assert('email', 'valid email required').isEmail();
return res.redirect('/email-signup'); var errors = req.validationErrors();
}
if (errors) {
req.flash('errors', errors);
return res.redirect('/email-signup');
}
var possibleUserData = req.body; var possibleUserData = req.body;