Merge branch 'master' into courseware

This commit is contained in:
Nathan Leniz
2015-02-04 21:28:41 -05:00
6 changed files with 17 additions and 15 deletions

View File

@@ -38,7 +38,7 @@ exports.index = function(req, res) {
exports.returnNextBonfire = function(req, res) {
if (!req.user) {
return res.redirect('bonfires/meet-bonfire');
return res.redirect('../bonfires/meet-bonfire');
}
var completed = req.user.completedBonfires.map(function (elem) {
return elem._id;
@@ -76,7 +76,7 @@ exports.returnIndividualBonfire = function(req, res, next) {
bonfire = bonfire.pop()
var dashedNameFull = bonfire.name.toLowerCase().replace(/\s/g, '-');
if (dashedNameFull != dashedName) {
return res.redirect('/bonfires/' + dashedNameFull);
return res.redirect('../bonfires/' + dashedNameFull);
}
if (bonfire.length < 1) {
req.flash('errors', {