krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-19 07:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into hairlessbear-quest_invite_modal_on_user_sync

Browse Source
This commit is contained in:
Blade Barringer
2015-06-28 21:07:32 -05:00
parent 0e4e7a032a 5f29e19aa7
commit b72b14fe6c
555 changed files with 15797 additions and 11552 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/src/models/user.js
View File

@@ -540,6 +540,9 @@ UserSchema.pre('save', function(next) {
UserSchema.methods.unlink = function(options, cb) {
var cid = options.cid, keep = options.keep, tid = options.tid;
if (!cid) {
return cb("Could not remove challenge tasks. Please delete them manually.");
}
var self = this;
switch (keep) {
case 'keep':