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

Merge branch 'develop' into common-convert

Browse Source
This commit is contained in:
Blade Barringer
2015-02-10 16:27:46 -06:00
parent 17032a4f13 9c6fc78a2f
commit 8ac9dc3ced
8 changed files with 178 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
website/src/middleware.js
View File

@@ -201,7 +201,8 @@ module.exports.locals = function(req, res, next) {
worldDmg: (tavern && tavern.quest && tavern.quest.extra && tavern.quest.extra.worldDmg) || {}
});
// Put query-string party invitations into session to be handled later
// Put query-string party (& guild but use partyInvite for backward compatibility)
// invitations into session to be handled later
try{
req.session.partyInvite = JSON.parse(utils.decrypt(req.query.partyInvite))
} catch(e){}