diff --git a/ghost/admin/views/base.js b/ghost/admin/views/base.js index fb93786a7e..2ec95cf806 100644 --- a/ghost/admin/views/base.js +++ b/ghost/admin/views/base.js @@ -99,8 +99,22 @@ } return message; - } + }, + // Getting URL vars + getUrlVariables: function () { + var vars = [], + hash, + hashes = window.location.href.slice(window.location.href.indexOf('?') + 1).split('&'), + i; + + for (i = 0; i < hashes.length; i += 1) { + hash = hashes[i].split('='); + vars.push(hash[0]); + vars[hash[0]] = hash[1]; + } + return vars; + } }); /** diff --git a/ghost/admin/views/login.js b/ghost/admin/views/login.js index e46ddc1305..4bd30eb964 100644 --- a/ghost/admin/views/login.js +++ b/ghost/admin/views/login.js @@ -46,6 +46,7 @@ event.preventDefault(); var email = this.$el.find('.email').val(), password = this.$el.find('.password').val(), + redirect = this.getUrlVariables().r, self = this; $.ajax({ @@ -53,7 +54,8 @@ type: 'POST', data: { email: email, - password: password + password: password, + redirect: redirect }, success: function (msg) { window.location.href = msg.redirect;