From 30fd8e26e6d6078d36975138fa130b235ade5969 Mon Sep 17 00:00:00 2001 From: Matteo Pagliazzi Date: Mon, 11 May 2015 17:02:36 +0200 Subject: [PATCH] revert last 2 commits --- website/src/models/user.js | 1 - website/src/utils.js | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/website/src/models/user.js b/website/src/models/user.js index 63e8cbd8ea..61f44e1724 100644 --- a/website/src/models/user.js +++ b/website/src/models/user.js @@ -148,7 +148,6 @@ var UserSchema = new Schema({ recaptureEmailsPhase: {type: Number, 'default': 0}, // Needed to track the tip to send inside the email weeklyRecapEmailsPhase: {type: Number, 'default': 0}, - lastWeeklyRecap: {type: Date, 'default': Date.now}, communityGuidelinesAccepted: {type: Boolean, 'default': false}, cronCount: {type:Number, 'default':0} }, diff --git a/website/src/utils.js b/website/src/utils.js index 37783f56ce..cefb9cab8c 100644 --- a/website/src/utils.js +++ b/website/src/utils.js @@ -61,7 +61,7 @@ module.exports.txnEmail = function(mailingInfoArray, emailType, variables, perso var mailingInfoArray = Array.isArray(mailingInfoArray) ? mailingInfoArray : [mailingInfoArray]; var variables = [ - {name: 'BASE_URL', content: 'https://habitrpg.com'} + {name: 'BASE_URL', content: baseUrl} ].concat(variables || []); // It's important to pass at least a user with its `preferences` as we need to check if he unsubscribed