Infrastructure/ghost
0
Fork 0
mirror of https://github.com/TryGhost/Ghost.git synced 2025-03-11 02:12:21 -05:00
Code Issues Activity

Swap url.resolve for slash handling

Browse source
This commit is contained in:
Hannah Wolfe 2013-12-04 20:58:59 +00:00
parent 0e7eb47cd9
commit 696cfe7018
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/server/controllers/admin.js
View file

@ -2,7 +2,6 @@ var Ghost = require('../../ghost'),
config = require('../config'),
_ = require('underscore'),
path = require('path'),
url = require('url'),
when = require('when'),
api = require('../api'),
mailer = require('../mail'),
@ -165,7 +164,7 @@ adminControllers = {
api.users.generateResetToken(email).then(function (token) {
var siteLink = '<a href="' + config().url + '">' + config().url + '</a>',
resetUrl = url.resolve(config().url, '/ghost/reset/') + token + '/',
resetUrl = config().url.replace(/\/$/, '') + '/ghost/reset/' + token + '/',
resetLink = '<a href="' + resetUrl + '">' + resetUrl + '</a>',
message = {
to: email,