Commit 8fe0fd00 authored by catch's avatar catch

Issue #2176721 by maartendeblock, nod_: 'Back to site' button does not...

Issue #2176721 by maartendeblock, nod_: 'Back to site' button does not preserve URL's language prefix and querystring.
parent b3e112fe
......@@ -9,13 +9,14 @@
var pathInfo = drupalSettings.path;
var escapeAdminPath = sessionStorage.getItem('escapeAdminPath');
var windowLocation = window.location;
// Saves the last non-administrative page in the browser to be able to link back
// to it when browsing administrative pages. If there is a destination parameter
// there is not need to save the current path because the page is loaded within
// an existing "workflow".
if (!pathInfo.currentPathIsAdmin && !/destination=/.test(window.location.search)) {
sessionStorage.setItem('escapeAdminPath', pathInfo.currentPath);
if (!pathInfo.currentPathIsAdmin && !/destination=/.test(windowLocation.search)) {
sessionStorage.setItem('escapeAdminPath', windowLocation.pathname.substring(pathInfo.basePath.length) + windowLocation.search);
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment